Hello community, here is the log from the commit of package kiwi for openSUSE:12.3 checked in at 2013-02-15 17:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kiwi (Old) and /work/SRC/openSUSE:12.3/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- New: ---- fix-systemd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.mvScXj/_old 2013-02-15 17:17:39.000000000 +0100 +++ /var/tmp/diff_new_pack.mvScXj/_new 2013-02-15 17:17:39.000000000 +0100 @@ -117,6 +117,7 @@ Source3: %{name}-repo.tar.bz2 Source4: %{name}-find-boot-requires.sh Patch0: fix-efi.patch +Patch1: fix-systemd.diff # build root path BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -468,6 +469,7 @@ %prep %setup -q -n %name -a2 -a3 %patch0 -p1 +%patch1 %build # empty because of rpmlint warning rpm-buildroot-usage ++++++ fix-systemd.diff ++++++ --- modules/KIWIConfig.sh +++ modules/KIWIConfig.sh @@ -1627,14 +1627,16 @@ # the specified value # ---- local RUNLEVEL=$1 + local target=/usr/lib/systemd/system/runlevel$RUNLEVEL.target + if [ ! -f $target ];then + target=/lib/systemd/system/runlevel$RUNLEVEL.target + fi case "$RUNLEVEL" in 1|2|3|5) sed -i "s/id:[0123456]:initdefault:/id:$RUNLEVEL:initdefault:/" \ /etc/inittab if test -d /etc/systemd/system; then - ln -sf \ - /lib/systemd/system/runlevel$RUNLEVEL.target \ - /etc/systemd/system/default.target + ln -sf $target /etc/systemd/system/default.target fi ;; *) --- modules/KIWILinuxRC.sh +++ modules/KIWILinuxRC.sh @@ -28,6 +28,7 @@ export HYBRID_PERSISTENT_DIR=/read-write export UTIMER_INFO=/dev/utimer export bootLoaderOK=0 +export enablePlymouth=1 #====================================== # Exports (console) @@ -661,8 +662,18 @@ udevTrigger # wait for events to finish udevPending - # start plymouth if it exists - startPlymouth + # start plymouth if it exists and enabled + for o in $(cat /proc/cmdline) ; do + case "$o" in + plymouth.enable=0*|rd.plymouth=0*) + enablePlymouth=0 + break + ;; + esac + done + if [ $enablePlymouth -eq 1 ]; then + startPlymouth + fi } #====================================== # moduleLoadBeforeUdev @@ -4031,8 +4042,8 @@ # updateMTAB #-------------------------------------- function updateMTAB { - prefix=$1 - umount=0 + local prefix=$1 + local umount=0 if [ ! -e /proc/mounts ];then mount -t proc proc /proc umount=1 @@ -6675,7 +6686,7 @@ # check for init kernel option #-------------------------------------- if [ -z "$init" ];then - if [ -f /mnt/bin/systemd ];then + if [ -e /mnt/bin/systemd ];then export init=/bin/systemd else export init=/sbin/init @@ -6774,6 +6785,12 @@ #-------------------------------------- if which plymouthd &>/dev/null;then plymouth update-root-fs --new-root-dir=/mnt + #====================================== + # stop if not installed in system image + #-------------------------------------- + if [ ! -e /mnt/usr/bin/plymouth ];then + plymouth quit + fi fi #====================================== # export root block device @@ -8886,9 +8903,16 @@ # ---- local itab=/etc/inittab local stty=/etc/securetty + local init=/bin/systemd local xvc="X0:12345:respawn:/sbin/mingetty --noclear xvc0 linux" local hvc="H0:12345:respawn:/sbin/mingetty --noclear hvc0 linux" #====================================== + # return early in case of systemd + #-------------------------------------- + if [ -e $init ];then + return + fi + #====================================== # create tty nodes if not done #-------------------------------------- setupTTY -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
