[tyndur-devel] [PATCH 4/4] Tastaturbelegung beim ersten Start abfragen

[Kevin Wolf <kevin@xxxxxxxxxx>]

+ setup: Beim Auswaehler der Tastaturbelegung die Wahl in
  config/keyboard.lsh abspeichern (als Skript, das die Belegung
  aktiviert)
+ root-common: keyboard.lsh vor getterm1 starten
+ keyboard.lsh: Konfiguration der Tastaturbelegung aufrufen, wodurch
  sich das Skript selbst ueberschreibt und beim naechsten Mal die
  richtige Tastaturbelegung laedt.

Signed-off-by: Kevin Wolf <kevin@xxxxxxxxxx>
---
 build/root-common/config/servmgr/config/cmd     |    1 +
 build/root-common/config/servmgr/config/conf    |    1 +
 build/root-common/config/servmgr/config/deps    |    2 ++
 build/root-common/config/servmgr/config/workdir |    1 +
 build/root-common/config/servmgr/getterm1/deps  |    1 +
 build/root-floppy/config/keyboard.lsh           |    3 +++
 build/root-hd/config/keyboard.lsh               |    3 +++
 src/modules/pas/setup/setup_keyboard.pas        |    7 +++++++
 8 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 build/root-common/config/servmgr/config/cmd
 create mode 100644 build/root-common/config/servmgr/config/conf
 create mode 100644 build/root-common/config/servmgr/config/deps
 create mode 100644 build/root-common/config/servmgr/config/workdir
 create mode 100644 build/root-floppy/config/keyboard.lsh
 create mode 100644 build/root-hd/config/keyboard.lsh

diff --git a/build/root-common/config/servmgr/config/cmd b/build/root-common/config/servmgr/config/cmd
new file mode 100644
index 0000000..410e9da
--- /dev/null
+++ b/build/root-common/config/servmgr/config/cmd
@@ -0,0 +1 @@
+/apps/getterm --once --auto vterm:/vterm0/in vterm:/vterm0/out vterm:/vterm0/out /config/keyboard.lsh
diff --git a/build/root-common/config/servmgr/config/conf b/build/root-common/config/servmgr/config/conf
new file mode 100644
index 0000000..319afcd
--- /dev/null
+++ b/build/root-common/config/servmgr/config/conf
@@ -0,0 +1 @@
+waitterminate
diff --git a/build/root-common/config/servmgr/config/deps b/build/root-common/config/servmgr/config/deps
new file mode 100644
index 0000000..5d3c62c
--- /dev/null
+++ b/build/root-common/config/servmgr/config/deps
@@ -0,0 +1,2 @@
+vterm
+mount
diff --git a/build/root-common/config/servmgr/config/workdir b/build/root-common/config/servmgr/config/workdir
new file mode 100644
index 0000000..db5802b
--- /dev/null
+++ b/build/root-common/config/servmgr/config/workdir
@@ -0,0 +1 @@
+file:/
diff --git a/build/root-common/config/servmgr/getterm1/deps b/build/root-common/config/servmgr/getterm1/deps
index 884bf14..4b6e1dd 100644
--- a/build/root-common/config/servmgr/getterm1/deps
+++ b/build/root-common/config/servmgr/getterm1/deps
@@ -1,3 +1,4 @@
 vterm
 cmos
 mount
+config
diff --git a/build/root-floppy/config/keyboard.lsh b/build/root-floppy/config/keyboard.lsh
new file mode 100644
index 0000000..22eaf78
--- /dev/null
+++ b/build/root-floppy/config/keyboard.lsh
@@ -0,0 +1,3 @@
+#!file:/apps/sh
+
+setup keyboard quit
diff --git a/build/root-hd/config/keyboard.lsh b/build/root-hd/config/keyboard.lsh
new file mode 100644
index 0000000..22eaf78
--- /dev/null
+++ b/build/root-hd/config/keyboard.lsh
@@ -0,0 +1,3 @@
+#!file:/apps/sh
+
+setup keyboard quit
diff --git a/src/modules/pas/setup/setup_keyboard.pas b/src/modules/pas/setup/setup_keyboard.pas
index 879ca88..1dedf06 100644
--- a/src/modules/pas/setup/setup_keyboard.pas
+++ b/src/modules/pas/setup/setup_keyboard.pas
@@ -31,6 +31,13 @@ begin
     Rewrite(f, 2048);
     BlockWrite(f, buf, 1);
     Close(f);
+
+    Assign(cfg, 'file:/config/keyboard.lsh');
+    Rewrite(cfg);
+    WriteLn(cfg, '#!file:/apps/sh');
+    WriteLn(cfg);
+    WriteLn(cfg, 'cp ', path, ' vterm:/keymap');
+    Close(cfg);
 end;
 
 procedure SetupKeyboard(back: boolean);
-- 
1.6.0.2