Changeset 2702
- Timestamp:
- 03/11/08 11:07:26 (9 months ago)
- Files:
-
- trunk/distrib/gentoo/initpost (modified) (3 diffs)
- trunk/scripts/vserver.functions (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/distrib/gentoo/initpost
r2699 r2702 84 84 echo "!!! packages into the guest environment." 85 85 echo "!!!" 86 else 87 # fix gettys in inittab 88 if $_CHROOT_SH testfile /etc/inittab; then 89 echo ">>> Fixing inittab ... " 90 chrootsed /etc/inittab \ 91 -e 's/\(^[^#].*getty.*$\)/#\1/' 92 fi 86 93 fi 87 94 88 89 95 # unneeded runlevel scripts 90 echo ">>> Fixing default runlevel scripts ... "91 96 if test $have_openrc -ne 1; then 97 echo ">>> Fixing default runlevel scripts ... " 92 98 $_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || : 93 99 $_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || : 94 100 fi 95 96 101 97 102 # setting hostname … … 102 107 fi 103 108 104 105 109 # fix syslog-ng.conf 106 110 if $_CHROOT_SH testfile /etc/syslog-ng/syslog-ng.conf; then … … 110 114 -e 's:\(.*console_all.*\):#\1:g' 111 115 fi 112 113 114 # fix gettys in inittab115 if $_CHROOT_SH testfile /etc/inittab; then116 echo ">>> Fixing inittab ... "117 chrootsed /etc/inittab \118 -e 's/\(^[^#].*getty.*$\)/#\1/'119 fi120 121 116 122 117 # fix fstab for checkfs/localmount in baselayout-2 trunk/scripts/vserver.functions
r2692 r2702 318 318 RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin 319 319 320 INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" ) 320 if test -x "$vdir/vdir/lib/rcscripts/sh/init-vserver.sh"; then 321 RC_WRAP=/lib/rcscripts/sh/init-vserver.sh 322 elif test -x "$vdir/vdir/lib/rc/sh/init-vserver.sh"; then 323 RC_WRAP=/lib/rc/sh/init-vserver.sh 324 else 325 panic "init-vserver.sh not found; aborting" 326 fi 327 328 INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" ) 321 329 INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown ) 322 330 INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
