diff options
Diffstat (limited to 'configs/releng/root-image')
| -rw-r--r-- | configs/releng/root-image/etc/fstab | 5 | ||||
| -rwxr-xr-x | configs/releng/root-image/etc/rc.d/archiso | 32 |
2 files changed, 18 insertions, 19 deletions
diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab deleted file mode 100644 index 0df0cba..0000000 --- a/configs/releng/root-image/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/fstab: static file system information -# -# <file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0 diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso index 68e8375..cc930f6 100755 --- a/configs/releng/root-image/etc/rc.d/archiso +++ b/configs/releng/root-image/etc/rc.d/archiso @@ -16,20 +16,24 @@ do_locale_gen () # start agetty on it too. do_special_console() { - cmdline_console="$(kernel_cmdline console)" - [ $? -ne 0 ] && return - - dev="${cmdline_console%%,*}" - args="${cmdline_console##*,}" - baud="${args%%[neo]*}" && baud="${baud:-"9600"}" - [ "x${args}" != "x${args%%r}" ] && rts="-h" - - - stat_busy "Starting agetty on console: ${cmdline_console}" - echo "${dev}" >> /etc/securetty - echo "z0:2345:respawn:/sbin/agetty ${rts} ${baud} ${dev} linux" >> /etc/inittab - /sbin/telinit q - stat_done + local cmdline_console + if cmdline_console=$(kernel_cmdline console); then + stat_busy "Starting agetty on console: ${cmdline_console}" + local port options baud rts + port=${cmdline_console%%,*} + options=${cmdline_console#${port}} + options=${options#,} + baud=${options%%[neo]*} + [[ ${options} =~ r$ ]] && rts="-h" + if ! grep -q "^${port}" /etc/securetty; then + echo ${port} >> /etc/securetty + fi + if ! grep -q "^z0:" /etc/inittab; then + echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab + fi + /sbin/telinit q + stat_done + fi } case "$1" in |