Changeset 2509

Show
Ignore:
Timestamp:
02/26/07 21:18:03 (2 years ago)
Author:
dhozac
Message:

Make the gentoo initstyle work with baselayout-vserver.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/distrib/gentoo/init-vserver.sh

    r2363 r2509  
    2525# 
    2626 
    27 RUNLEVEL=1 /sbin/rc sysinit 
    28 /sbin/rc boot 
     27RUNLEVEL=1 /sbin/rc sysinit || exit 1 
     28/sbin/rc boot || exit 1 
    2929/sbin/rc ${1:-default} 
     30exit 0 
  • trunk/scripts/vserver.functions

    r2507 r2509  
    307307            INITCMD_STOP=( /sbin/rc shutdown ) 
    308308            INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp ) 
    309  
    310             pushd "$vdir"/vdir &>/dev/null 
    311             basever=$($_CHROOT_SH cat /etc/gentoo-release | $_AWK '{print $5}') 
    312             popd &>/dev/null 
    313  
    314             basemaj=${basever/.*} 
    315             basemin=${basever#*.} 
    316             basemin=${basemin/.*} 
    317  
    318             test "$basemaj" -lt 1 -o "$basemin" -lt 13 && \ 
    319             panic "\ 
    320 Using init-style 'gentoo' requires >=baselayout-1.13 inside the vserver! 
    321  
    322 Your vserver ($(basename "$vdir")) seems to have baselayout-$basever, 
    323 please use 'plain' init-style instead!" 
    324309            ;; 
    325310