From 94cd0568c3c6e6183e16a06ad50819997c34a8d1 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 15 Sep 2012 19:10:08 +0200 Subject: [PATCH] All platforms: use --loginpause instead of --loginprog .. which doesn't work since login switch to util-linux 2.22; requires mingetty 1.08 --- platforms/flash-1GB/post.inc.sh | 2 +- platforms/flash-512MB/post.inc.sh | 2 +- platforms/livecd-gnome-root/post.inc.sh | 4 ++-- platforms/livecd-light-root/post.inc.sh | 4 ++-- platforms/livecd-root/post.inc.sh | 4 ++-- platforms/livedvd-root/post.inc.sh | 4 ++-- platforms/livegames-root/post.inc.sh | 4 ++-- platforms/livestudio-root/post.inc.sh | 4 ++-- platforms/rootfs-light/post.inc.sh | 4 ++-- platforms/rootfs/post.inc.sh | 4 ++-- platforms/testcd-root/post.inc.sh | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/platforms/flash-1GB/post.inc.sh b/platforms/flash-1GB/post.inc.sh index 8098ce7..5d6620d 100644 --- a/platforms/flash-1GB/post.inc.sh +++ b/platforms/flash-1GB/post.inc.sh @@ -6,7 +6,7 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab diff --git a/platforms/flash-512MB/post.inc.sh b/platforms/flash-512MB/post.inc.sh index 50b083e..76fefb3 100644 --- a/platforms/flash-512MB/post.inc.sh +++ b/platforms/flash-512MB/post.inc.sh @@ -6,7 +6,7 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index 066e728..5851121 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 4d0c12d..a681b8d 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 1d9a608..cf9d30d 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index 0413984..6e830d1 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 5edf037..631c908 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/livestudio-root/post.inc.sh b/platforms/livestudio-root/post.inc.sh index 63ae7f2..4fdeccd 100644 --- a/platforms/livestudio-root/post.inc.sh +++ b/platforms/livestudio-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index 1bd7dfd..42f7727 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -73,8 +73,8 @@ _EOF echo "Forcing \`inittab' to open tty root shells with no login..." # configure for serial console login #echo "s0:2345:respawn:/sbin/agetty -L -f /etc/issue 115200 tcc-uart0 vt100" >> $MOUNTDIR/etc/inittab -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index 826f975..f97142c 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -70,8 +70,8 @@ _EOF # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i 's,^4:.*,4:2345:respawn:/sbin/agetty ttyS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^5:.*,5:2345:respawn:/sbin/agetty ttyGS0 9600,' $MOUNTDIR/etc/inittab sed -i 's,^6:.*,6:2345:respawn:/sbin/agetty ttyAMA0 9600,' $MOUNTDIR/etc/inittab diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 1d9a608..cf9d30d 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -6,8 +6,8 @@ # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." -sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty1,' $MOUNTDIR/etc/inittab -sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginprog /sbin/login.live --noclear tty\1,' $MOUNTDIR/etc/inittab +sed -i 's,^1:.*,1:234:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty1,' $MOUNTDIR/etc/inittab +sed -i 's,^\([2-3]\):.*,\1:2345:respawn:/sbin/mingetty --autologin root --loginpause --noclear tty\1,' $MOUNTDIR/etc/inittab sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # configure for runlevel 5 boot