Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2011-11-07 14:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-11-02 11:57:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-11-07 14:18:38.000000000 +0100 @@ -1,0 +2,65 @@ +Thu Nov 3 09:51:50 CET 2011 - [email protected] + +- v4.98.13 released + +------------------------------------------------------------------- +Thu Nov 3 09:41:38 CET 2011 - [email protected] + +- setupDefaultGateway uses route but route was not part of the initrd + +------------------------------------------------------------------- +Thu Nov 3 09:38:04 CET 2011 - [email protected] + +- fdasdGetPartitionID uses awk but awk was not part of the initrd + +------------------------------------------------------------------- +Thu Nov 3 09:14:43 CET 2011 - [email protected] + +- moved hook calls pre/postpartition outside of the block + which allows to skip the partition code via the hook + script + +------------------------------------------------------------------- +Wed Nov 2 12:10:29 CET 2011 - [email protected] + +- fixed repartition code to create an aligned table (bnc #721580) + +------------------------------------------------------------------- +Mon Oct 31 16:49:05 CET 2011 - [email protected] + +- setup PXE_IFACE interface only if PXE_IFACE exists in the + environment. When using zPXE this variable does not exist + +------------------------------------------------------------------- +Mon Oct 31 16:23:18 CET 2011 - [email protected] + +- fixed setupNetworkStatic to write correct interface file + +------------------------------------------------------------------- +Mon Oct 31 16:13:05 CET 2011 - [email protected] + +- removed static inittab and securetty overlay files from s390 + JeOS template. The setup is done by setupConsole() in preinit + +------------------------------------------------------------------- +Mon Oct 31 16:09:35 CET 2011 - [email protected] + +- call runPreinitServices in s390 netboot suse-preinit + +------------------------------------------------------------------- +Mon Oct 31 15:48:09 CET 2011 - [email protected] + +- turn pxe PART info tranformation functions into a generic + and a fdasd specific function + +------------------------------------------------------------------- +Mon Oct 31 15:38:51 CET 2011 - [email protected] + +- added pxePartitionInputS390 suitable for use with fdasd + +------------------------------------------------------------------- +Mon Oct 31 15:04:13 CET 2011 - [email protected] + +- added pxeRaidPartitionInputS390 suitable for use with fdasd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.EKvRu0/_old 2011-11-07 14:18:40.000000000 +0100 +++ /var/tmp/diff_new_pack.EKvRu0/_new 2011-11-07 14:18:40.000000000 +0100 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.98.12 +Version: 4.98.13 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-31 10:14:36.000000000 +0100 +++ new/kiwi/.revision 2011-11-03 09:52:25.000000000 +0100 @@ -1 +1 @@ -98a56eb39d341590b41e83b10693cbe34472d7af +1492b1caec24fa01e08a7c35fabdf1aaccae7b7e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2011-10-28 13:59:39.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-11-03 09:52:29.000000000 +0100 @@ -986,6 +986,7 @@ qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk startproc zfcp_host_configure zfcp_disk_configure vgrename kpartx_id mpath_id dmraid dmevent_tool which mpath_wait seq + route " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2011-10-31 10:25:04.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2011-11-03 09:52:29.000000000 +0100 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.98.12"; + $data{Version} = "4.98.13"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-10-31 10:14:36.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-11-03 09:52:29.000000000 +0100 @@ -2335,6 +2335,9 @@ # create the /sysconfig/network file according to the PXE # boot interface. # ---- + if [ -z "$PXE_IFACE" ];then + return + fi local prefix=$1 local niface=$prefix/etc/sysconfig/network/ifcfg-$PXE_IFACE mkdir -p $prefix/etc/sysconfig/network @@ -4005,7 +4008,7 @@ hostip=$(echo $hostip | cut -f1 -d/) netmask=$(convertCIDRToNetmask $cidr) fi - if [ "$up" == "1" ];then + if [ "$up" = "1" ];then #====================================== # activate network #-------------------------------------- @@ -4024,11 +4027,12 @@ if [ ! $? = 0 ];then systemException "Failed to set up the network: $iface" "reboot" fi - else + export iface_static=$iface + elif [ ! -z $iface_static ];then #====================================== # write network setup #-------------------------------------- - local netFile="/etc/sysconfig/network/ifcfg-$iface" + local netFile="/etc/sysconfig/network/ifcfg-$iface_static" echo "BOOTPROTO='static'" > $netFile echo "STARTMODE='auto'" >> $netFile echo "IPADDR='$hostip'" >> $netFile @@ -4187,7 +4191,7 @@ function fdasdGetPartitionID { local count=1 for i in $(fdasd -s -p $1 | grep -E '^[ ]+\/' |\ - awk -v OFS=":" '$1=$1' | cut -f5 -d:);do + awk -v OFS=":" '$1=$1' | cut -f5 -d:);do if [ $count = $2 ];then if $i = 2;then echo 82 @@ -6784,7 +6788,7 @@ #-------------------------------------- function partedSectorInit { # /.../ - # return start/end sectors of current partitions. + # return aligned start/end sectors of current table. # ---- IFS=$IFS_ORIG local disk=$1 @@ -6803,14 +6807,11 @@ startSectors=${startSectors}:${s_start}s fi if [ -z "$endSectors" ];then - endSectors=$((s_stopp + 1))s + endSectors=$((s_stopp/8*8+8))s else - endSectors=$endSectors:$((s_stopp + 1))s + endSectors=$endSectors:$((s_stopp/8*8+8))s fi done - if [ -z "$startSectors" ];then - startSectors=1 - fi } #====================================== # partedEndCylinder @@ -7339,6 +7340,66 @@ # pxePartitionInput #-------------------------------------- function pxePartitionInput { + if [ $PARTITIONER = "fdasd" ];then + pxePartitionInputFDASD + else + pxePartitionInputGeneric + fi +} +#====================================== +# pxeRaidPartitionInput +#-------------------------------------- +function pxeRaidPartitionInput { + if [ $PARTITIONER = "fdasd" ];then + pxeRaidPartitionInputFDASD + else + pxeRaidPartitionInputGeneric + fi +} +#====================================== +# pxePartitionInputFDASD +#-------------------------------------- +function pxePartitionInputFDASD { + local field=0 + local count=0 + local IFS="," + for i in $PART;do + field=0 + count=$((count + 1)) + IFS=";" ; for n in $i;do + case $field in + 0) partSize=$n ; field=1 ;; + 1) partID=$n ; field=2 ;; + 2) partMount=$n; + esac + done + partSize=$(pxeSizeToMB $partSize) + if [ "$partID" = '82' ] || [ "$partID" = 'S' ];then + partID=2 + elif [ "$partID" = '83' ] || [ "$partID" = 'L' ];then + partID=1 + elif [ "$partID" -eq '8e' ] || [ "$partID" = 'V' ];then + partID=4 + else + partID=1 + fi + echo -n "n . $partSize " + if [ $partID = "2" ] || [ $partID = "4" ];then + echo -n "t $count $partID " + fi + done + echo "w" +} +#====================================== +# pxeRaidPartitionInputFDASD +#-------------------------------------- +function pxeRaidPartitionInputFDASD { + pxePartitionInputFDASD +} +#====================================== +# pxePartitionInputGeneric +#-------------------------------------- +function pxePartitionInputGeneric { local field=0 local count=0 local IFS="," @@ -7377,9 +7438,9 @@ echo "w q" } #====================================== -# pxeRaidPartitionInput +# pxeRaidPartitionInputGeneric #-------------------------------------- -function pxeRaidPartitionInput { +function pxeRaidPartitionInputGeneric { local field=0 local count=0 local IFS="," diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -240,7 +240,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -244,7 +244,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -245,7 +245,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -111,7 +111,6 @@ <package name="perl-gettext"/> <package name="perl-Bootloader"/> <package name="pam-modules"/> - <package name="gawk"/> <package name="gnome-filesystem"/> <package name="openslp"/> <package name="suse-build-key"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -230,7 +230,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -113,7 +113,6 @@ <package name="perl-gettext"/> <package name="perl-Bootloader"/> <package name="pam-modules"/> - <package name="gawk"/> <package name="gnome-filesystem"/> <package name="openslp"/> <package name="suse-build-key"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -231,7 +231,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-11-03 09:52:29.000000000 +0100 @@ -344,8 +344,8 @@ #====================================== # 14) Create ptable on diskful system #-------------------------------------- +runHook prepartition if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then - runHook prepartition #====================================== # Create partition table #-------------------------------------- @@ -427,8 +427,8 @@ createFilesystem $imageBootDevice fi fi - runHook postpartition fi +runHook postpartition #====================================== # 15) Setup root device environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2011-10-28 13:59:34.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -229,7 +229,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2011-10-28 13:59:35.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2011-11-03 09:52:29.000000000 +0100 @@ -344,8 +344,8 @@ #====================================== # 14) Create ptable on diskful system #-------------------------------------- +runHook prepartition if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then - runHook prepartition #====================================== # Create partition table #-------------------------------------- @@ -427,8 +427,8 @@ createFilesystem $imageBootDevice fi fi - runHook postpartition fi +runHook postpartition #====================================== # 15) Setup root device environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2011-10-28 13:59:35.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2011-11-03 09:52:29.000000000 +0100 @@ -119,7 +119,6 @@ <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="glibc-locale"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-31 10:14:36.000000000 +0100 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-11-03 09:52:29.000000000 +0100 @@ -358,8 +358,8 @@ #====================================== # 14) Create ptable on diskful system #-------------------------------------- +runHook prepartition if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then - runHook prepartition #====================================== # Create partition table #-------------------------------------- @@ -443,8 +443,8 @@ createFilesystem $imageBootDevice fi fi - runHook postpartition fi +runHook postpartition #====================================== # 15) Setup root device environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-preinit new/kiwi/system/boot/s390/netboot/suse-preinit --- old/kiwi/system/boot/s390/netboot/suse-preinit 2011-10-28 13:59:35.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-preinit 2011-11-03 09:52:25.000000000 +0100 @@ -39,7 +39,25 @@ udevSystemStart #====================================== -# 4) create initrd on diskful +# 5) update mount table +#-------------------------------------- +updateMTAB + +#====================================== +# 6) check preinit services +#-------------------------------------- +if isVirtioDevice;then + runPreinitServices virtio +fi +if isDASDDevice;then + runPreinitServices dasd +fi +if isZFCPDevice;then + runPreinitServices zfcp +fi + +#====================================== +# 7) create initrd on diskful #-------------------------------------- if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ]; then if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then @@ -56,14 +74,14 @@ fi #====================================== -# 5) Install boot loader on diskful +# 8) Install boot loader on diskful #-------------------------------------- if [ "$bootLoaderOK" = 1 ];then installBootLoader fi #====================================== -# 6) create /etc/ImagePackages +# 9) create /etc/ImagePackages #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then if [ -x /bin/rpm ];then @@ -73,7 +91,7 @@ fi #====================================== -# 7) check for valid mount points +# 10) check for valid mount points #-------------------------------------- if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ];then IFS=":" ; for i in $PART_MOUNT;do @@ -84,7 +102,7 @@ fi #====================================== -# 8) Update /etc/ImageVersion files +# 11) Update /etc/ImageVersion files #-------------------------------------- if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ];then count=0 @@ -108,31 +126,31 @@ fi #====================================== -# 9) setup console +# 12) setup console #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole fi #====================================== -# 10) setup static network +# 13) setup static network #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupNetworkStatic 0 fi #====================================== -# 11) kernelCheck +# 14) kernelCheck #-------------------------------------- kernelCheck #====================================== -# 12) create origin snapshot if possible +# 15) create origin snapshot if possible #-------------------------------------- createOriginSnapshot #====================================== -# 13) kill udev +# 16) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh --- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -#!/bin/bash -# hvc console setup for KVM guest -# ---- -cp /etc/init.d/kiwi/virtio/inittab /etc -cp /etc/init.d/kiwi/virtio/securetty /etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab --- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -# -# /etc/inittab -# -# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. All rights reserved. -# -# Author: Florian La Roche, 1996 -# Please send feedback to http://www.suse.de/feedback -# -# This is the main configuration file of /sbin/init, which -# is executed by the kernel on startup. It describes what -# scripts are used for the different run-levels. -# -# All scripts for runlevel changes are in /etc/init.d/. -# -# This file may be modified by SuSEconfig unless CHECK_INITTAB -# in /etc/sysconfig/suseconfig is set to "no" -# - -# The default runlevel is defined here -id:3:initdefault: - -# First script to be executed, if not booting in emergency (-b) mode -si::bootwait:/etc/init.d/boot - -# /etc/init.d/rc takes care of runlevel handling -# -# runlevel 0 is System halt (Do not use this for initdefault!) -# runlevel 1 is Single user mode -# runlevel 2 is Local multiuser without remote network (e.g. NFS) -# runlevel 3 is Full multiuser with network -# runlevel 4 is Not used -# runlevel 5 is Full multiuser with network and xdm -# runlevel 6 is System reboot (Do not use this for initdefault!) -# -l0:0:wait:/etc/init.d/rc 0 -l1:1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -#l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 - -# what to do in single-user mode -ls:S:wait:/etc/init.d/rc S -~~:S:respawn:/sbin/sulogin - -# Default HMC/3215/3270 console: -#1:2345:respawn:/sbin/mingetty --noclear /dev/ttyS0 dumb -# VT220(Linux) console: -#2:2345:respawn:/sbin/mingetty --noclear /dev/ttyS1 xterm -# additional 3270 terminals: -#3:2345:respawn:/sbin/mingetty --noclear /dev/3270/ttycons dumb -# KVM hypervisor console: -1:2345:respawn:/sbin/mingetty --noclear /dev/hvc0 linux - -# what to do when CTRL-ALT-DEL is pressed -ca::ctrlaltdel:/sbin/shutdown -r -t 4 now - -# not used for now: -pf::powerwait:/etc/init.d/powerfail start -pn::powerfailnow:/etc/init.d/powerfail now -#pn::powerfail:/etc/init.d/powerfail now -po::powerokwait:/etc/init.d/powerfail stop -sh:12345:powerfail:/sbin/shutdown -h now THE POWER IS FAILING - -# end of /etc/inittab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty --- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -# -# This file contains the device names of tty lines (one per line, -# without leading /dev/) on which root is allowed to login. -# -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyS0 -ttyS1 -hvc0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
