summaryrefslogtreecommitdiff
path: root/debian/local
diff options
context:
space:
mode:
Diffstat (limited to 'debian/local')
-rwxr-xr-xdebian/local/finish-install.d/51hurd_config-console18
-rwxr-xr-xdebian/local/runsystem7
2 files changed, 22 insertions, 3 deletions
diff --git a/debian/local/finish-install.d/51hurd_config-console b/debian/local/finish-install.d/51hurd_config-console
index 03cc7697..55ea3d07 100755
--- a/debian/local/finish-install.d/51hurd_config-console
+++ b/debian/local/finish-install.d/51hurd_config-console
@@ -1,3 +1,19 @@
#!/bin/sh
-[ -f /var/run/hurd-console.pid ] || sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console
+if [ -f /var/run/hurd-console.pid ]
+then
+ VGA_OPTIONS=""
+ for i in $(cat /proc/cmdline) ; do
+ case "$i" in
+ VGA_OPTIONS=*)
+ VGA_OPTIONS=${i#VGA_OPTIONS=}
+ ;;
+ esac
+ done
+ if [ -n "$VGA_OPTIONS" ]
+ then
+ sed -i -e "s/DISPLAY='-d vga'/DISPLAY='-d vga $VGA_OPTIONS'/" /target/etc/default/hurd-console
+ fi
+else
+ sed -i -e "s/ENABLE='true'/ENABLE='false'/" /target/etc/default/hurd-console
+fi
diff --git a/debian/local/runsystem b/debian/local/runsystem
index a59ff716..ddb45270 100755
--- a/debian/local/runsystem
+++ b/debian/local/runsystem
@@ -14,7 +14,7 @@ mem=`vmstat-hurd --size -k`
if [ "$mem" -lt 240000 ]
then
echo "You only have ${mem}KiB memory."
- echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 256MiB memory, sorry."
+ echo "Debian GNU/Hurd installation has not been optimized for memory usage yet, and thus currently needs at least 512MiB memory, sorry."
while true
do
sleep 60
@@ -42,6 +42,9 @@ for i in $envvars ; do
TERM=*)
term=yes
;;
+ VGA_OPTIONS=*)
+ VGA_OPTIONS=${i#VGA_OPTIONS=}
+ ;;
esac
done
@@ -63,7 +66,7 @@ then
. /etc/default/keyboard
[ -z "$XKBLAYOUT" ] || LAYOUT="--keymap $XKBLAYOUT"
fi
- console -d vga -g -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs &
+ console -d vga -g $VGA_OPTIONS -d pc_kbd --repeat=kbd $LAYOUT -d pc_mouse --repeat=mouse -c /dev/vcs &
echo $! > /var/run/hurd-console.pid
wait
echo