projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ce33a1
)
Remove unnecessary indentation level.
author
Chris Lamb
<chris@chris-lamb.co.uk>
Sun, 17 Aug 2008 23:52:12 +0000
(
00:52
+0100)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:48:01 +0000
(17:48 +0100)
scripts/live-bottom/25configure_init
patch
|
blob
|
history
diff --git
a/scripts/live-bottom/25configure_init
b/scripts/live-bottom/25configure_init
index
3c2f765
..
bb06eb5
100755
(executable)
--- a/
scripts/live-bottom/25configure_init
+++ b/
scripts/live-bottom/25configure_init
@@
-28,65
+28,62
@@
log_begin_msg "Setting up init"
# Arrange for shells on virtual consoles, rather than login prompts
# Arrange for shells on virtual consoles, rather than login prompts
-if [ -z "${NOAUTOLOGIN}" ]
+if [ -z "${NOAUTOLOGIN}" ]
&& [ -n "${USERNAME}" ]
then
then
- if [
-n "${USERNAME
}" ]
+ if [
! -z "${LIVE_GETTY
}" ]
then
then
- if
[ ! -z "${LIVE_GETTY}" ]
+ if
echo "${DEFCONSOLE}" | grep -qs ttyS
then
then
- if echo "${DEFCONSOLE}" | grep -qs ttyS
+ # AUTOMATIC SERIAL CONSOLE #
+ PORT=$(echo "${DEFCONSOLE}" | \
+ sed -e 's%,.*%%')
+ SPEED=$(echo "${DEFCONSOLE}" | \
+ sed -e 's%ttyS[0-9]\+,%%' \
+ -e's%\([0-9]\+\).*%\1%')
+
+ if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
then
then
- # AUTOMATIC SERIAL CONSOLE #
- PORT=$(echo "${DEFCONSOLE}" | \
- sed -e 's%,.*%%')
- SPEED=$(echo "${DEFCONSOLE}" | \
- sed -e 's%ttyS[0-9]\+,%%' \
- -e's%\([0-9]\+\).*%\1%')
-
- if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" )
- then
- IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
-
- for ID1 in ${IDs}
+ IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9"
+
+ for ID1 in ${IDs}
+ do
+ for ID2 in ${IDs}
do
do
- for ID2 in ${IDs}
- do
- ID="${ID1}${ID2}"
-
- if ! grep "^${ID}:" /etc/inittab
- then
- #make sure it is not already in use
- break 2
- fi
- done
- done
+ ID="${ID1}${ID2}"
- echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" >> /root/etc/inittab
- fi
- fi
+ if ! grep "^${ID}:" /etc/inittab
+ then
+ #make sure it is not already in use
+ break 2
+ fi
+ done
+ done
- if [ -f /root/etc/inittab ]
- then
- sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
- fi
- else
- if [ -f /root/etc/inittab ]
- then
- sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${USERNAME} </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+ echo "${ID}:2345:respawn:/sbin/live-getty -L ${PORT} ${SPEED} vt100" >> /root/etc/inittab
fi
fi
+ fi
- if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]
- then
- for f in /root/etc/event.d/tty*
- do
- sed -i -e "s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
- done
- fi
+ if [ -f /root/etc/inittab ]
+ then
+ sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/live-getty%' /root/etc/inittab
+ fi
+ else
+ if [ -f /root/etc/inittab ]
+ then
+ sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f ${USERNAME} </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
fi
fi
- # Since we use autologin, lastlog doesn't make sense on the console.
- sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
+ if [ "/root/etc/event.d/tty*" != "$(echo /root/etc/event.d/tty*)" ]
+ then
+ for f in /root/etc/event.d/tty*
+ do
+ sed -i -e "s|^respawn.*|respawn /bin/login -f ${USERNAME} </dev/$(basename ${f}) > /dev/$(basename ${f}) 2>\&1|" ${f}
+ done
+ fi
fi
fi
+
+ # Since we use autologin, lastlog doesn't make sense on the console.
+ sed -i '/^[^#].*pam_lastlog\.so/s/^/# /' /root/etc/pam.d/login
fi
# do not try to remove files if using file-rc
fi
# do not try to remove files if using file-rc