X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=distrib%2Fgentoo%2Finitpost;h=a61ab1b9773b991f7c72fb0bde04e33b8ad725ef;hb=b7785f953cf988346d0f36c5852af39db3d1b00c;hp=af89200cb3dff3e5953f60432f00d84b413162fd;hpb=19ef6bad17e92a9cedb7db8eddee2bebf1aa7c4d;p=util-vserver.git

diff --git a/distrib/gentoo/initpost b/distrib/gentoo/initpost
index af89200..a61ab1b 100755
--- a/distrib/gentoo/initpost
+++ b/distrib/gentoo/initpost
@@ -51,6 +51,11 @@ $_CHROOT_SH mkdir /usr/portage 2>/dev/null || :
 $_CHROOT_SH mkdir /usr/portage/distfiles 2>/dev/null || :
 
 
+# check if we have openrc
+have_openrc=0
+$_CHROOT_SH testfile /lib/rc/bin/is_older_than && have_openrc=1
+
+
 # gentoo initstyle magic
 initstyle=sysv
 test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
@@ -59,8 +64,8 @@ if test "$initstyle" == "gentoo"; then
 	echo ">>> Installing special init-style magic ... "
 
 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
-	$_CHROOT_SH truncate   /lib/rcscripts/sh/init-vserver.sh
-	$_CHROOT_SH chmod 0755 /lib/rcscripts/sh/init-vserver.sh
+	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
+	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
 
 	$_CAT "$__DISTRIBDIR"/gentoo/reboot.sh | \
 	$_CHROOT_SH truncate   /etc/init.d/reboot.sh
@@ -78,23 +83,29 @@ if test "$initstyle" == "gentoo"; then
 	echo "!!! Consult the Gentoo Handbook on how to chroot and install"
 	echo "!!! packages into the guest environment."
 	echo "!!!"
+else
+	# fix gettys in inittab
+	if $_CHROOT_SH testfile /etc/inittab; then
+		echo ">>> Fixing inittab ... "
+		chrootsed /etc/inittab \
+			-e 's/\(^[^#].*getty.*$\)/#\1/'
+	fi
 fi
 
-
 # unneeded runlevel scripts
-echo ">>> Fixing default runlevel scripts ... "
-$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
-$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
-
+if test $have_openrc -ne 1; then
+	echo ">>> Fixing default runlevel scripts ... "
+	$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
+	$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
+fi
 
 # setting hostname
 if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then
 	echo ">>> Setting hostname ... "
 	chrootsed /etc/conf.d/hostname \
-		-e "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":"
+		-e "s:\(HOSTNAME\)=\"\(.*\)\":\1=\"$(< "$cfgdir"/uts/nodename)\":i"
 fi
 
-
 # fix syslog-ng.conf
 if $_CHROOT_SH testfile /etc/syslog-ng/syslog-ng.conf; then
 	echo ">>> Fixing syslog-ng.conf ... "
@@ -103,27 +114,21 @@ if $_CHROOT_SH testfile /etc/syslog-ng/syslog-ng.conf; then
 		-e 's:\(.*console_all.*\):#\1:g'
 fi
 
-
-# fix gettys in inittab
-if $_CHROOT_SH testfile /etc/inittab; then
-	echo ">>> Fixing inittab ... "
-	chrootsed /etc/inittab \
-		-e 's/\(^[^#].*getty.*$\)/#\1/'
-fi
-
-
 # fix fstab for checkfs/localmount in baselayout-2
 # (does not affect any previous versions)
-echo ">>> Fixing fstab ... "
-echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
-
+if test $have_openrc -ne 1; then
+	echo ">>> Fixing fstab ... "
+	echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
+fi
 
 # always satisfy net dependency in baselayout-2
 # (does not affect any previous versions)
-echo ">>> Providing dummy net dependency ... "
-$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
-$_CHROOT_SH truncate /etc/init.d/net.vserver
-$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
-$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
+if test $have_openrc -ne 1; then
+	echo ">>> Providing dummy net dependency ... "
+	$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
+	$_CHROOT_SH truncate /etc/init.d/net.vserver
+	$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
+	$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
+fi
 
 popd &>/dev/null