Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2013-09-26 19:38:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-09-23 10:05:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-09-26 19:38:20.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Sep 24 17:16:19 CEST 2013 - ohering@suse.de + +- Version 2.8.0 + +------------------------------------------------------------------- +Tue Sep 24 16:29:51 CEST 2013 - ohering@suse.de + +- Add support for root=/dev/nfs (bnc#617830). + +------------------------------------------------------------------- +Tue Sep 24 15:32:46 CEST 2013 - ohering@suse.de + +- Add a support for "tmpfs_options" option on command line + (bnc#483965). + +------------------------------------------------------------------- +Sun Sep 22 19:19:25 CEST 2013 - ohering@suse.de + +- Check if kver/kernel/drivers/scsi/device_handler/ exists before + searching for scsi_dh_* modules (bnc#727428) + +------------------------------------------------------------------- @@ -992 +1014 @@ -- Add support for KMS. +- Add support for KMS. (bnc#560419) @@ -1053,0 +1076,5 @@ +Tue Oct 27 16:11:46 CEST 2009 - mvancura@suse.cz + +- Fix support for UUID= and LABEL= in /etc/fstab (bnc#702361). + +------------------------------------------------------------------- @@ -1056 +1083 @@ -- add any required firmware to the initrd +- add any required firmware to the initrd (bnc#564857) @@ -1154,0 +1182,5 @@ +Tue Jun 23 10:59:10 CEST 2009 - mvancura@suse.cz + +- new udev will need /sbin/blkid in initramfs (bnc#513994) + +------------------------------------------------------------------- @@ -1157 +1189 @@ -- mounting /root/proc for SELinux (bnc#457984) +- mounting /root/proc for SELinux (bnc#457984, bnc#467342) @@ -1174,0 +1207,5 @@ +Thu Apr 30 10:00:34 CEST 2009 - hare@suse.de + +- Using ifup for network initialisation (bnc#487723) + +------------------------------------------------------------------- @@ -1185 +1222 @@ - systems which use the localtime in the UTC + systems which use the localtime in the UTC (bnc#550697) @@ -1187 +1224 @@ - the clock for systems with local time in RTC + the clock for systems with local time in RTC (bnc#550697) @@ -1285 +1322 @@ - (bnc #447968). + (bnc #447968, bnc#471815, bnc#634053). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.saMVMN/_old 2013-09-26 19:38:21.000000000 +0200 +++ /var/tmp/diff_new_pack.saMVMN/_new 2013-09-26 19:38:21.000000000 +0200 @@ -41,7 +41,7 @@ %else Requires: sysvinit %endif -Version: 2.7.2 +Version: 2.8.0 Release: 0 Conflicts: udev < 118 Conflicts: mdadm < 3.3 ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes new/mkinitrd-2.8.0/mkinitrd.changes --- old/mkinitrd-2.7.2/mkinitrd.changes 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/mkinitrd.changes 2013-09-24 17:17:48.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Tue Sep 24 17:16:19 CEST 2013 - ohering@suse.de + +- Version 2.8.0 + +------------------------------------------------------------------- +Tue Sep 24 16:29:51 CEST 2013 - ohering@suse.de + +- Add support for root=/dev/nfs (bnc#617830). + +------------------------------------------------------------------- +Tue Sep 24 15:32:46 CEST 2013 - ohering@suse.de + +- Add a support for "tmpfs_options" option on command line + (bnc#483965). + +------------------------------------------------------------------- +Sun Sep 22 19:19:25 CEST 2013 - ohering@suse.de + +- Check if kver/kernel/drivers/scsi/device_handler/ exists before + searching for scsi_dh_* modules (bnc#727428) + +------------------------------------------------------------------- Wed Sep 18 15:48:09 CEST 2013 - ohering@suse.de - Conflicts with mdadm older than 3.3 after previous change (bnc#838777) @@ -989,7 +1011,7 @@ ------------------------------------------------------------------- Mon Jan 25 16:03:04 CET 2010 - eich@freedesktop.org -- Add support for KMS. +- Add support for KMS. (bnc#560419) ------------------------------------------------------------------- Tue Jan 19 11:34:09 CET 2010 - mmarek@suse.cz @@ -1051,9 +1073,14 @@ find out and copy if a module requires firmware files ------------------------------------------------------------------- +Tue Oct 27 16:11:46 CEST 2009 - mvancura@suse.cz + +- Fix support for UUID= and LABEL= in /etc/fstab (bnc#702361). + +------------------------------------------------------------------- Thu Oct 22 16:54:45 CEST 2009 - ro@suse.de -- add any required firmware to the initrd +- add any required firmware to the initrd (bnc#564857) ------------------------------------------------------------------- Thu Oct 22 16:13:21 CEST 2009 - mmarek@suse.cz @@ -1152,9 +1179,14 @@ build failure ------------------------------------------------------------------- +Tue Jun 23 10:59:10 CEST 2009 - mvancura@suse.cz + +- new udev will need /sbin/blkid in initramfs (bnc#513994) + +------------------------------------------------------------------- Tue Jun 23 07:38:22 CEST 2009 - thomas@novell.com -- mounting /root/proc for SELinux (bnc#457984) +- mounting /root/proc for SELinux (bnc#457984, bnc#467342) ------------------------------------------------------------------- Mon May 25 12:15:08 CEST 2009 - ro@suse.de @@ -1172,6 +1204,11 @@ - Do not include binaries for bash builtins ------------------------------------------------------------------- +Thu Apr 30 10:00:34 CEST 2009 - hare@suse.de + +- Using ifup for network initialisation (bnc#487723) + +------------------------------------------------------------------- Wed Apr 29 17:41:38 CEST 2009 - werner@suse.de - Minor changes @@ -1182,9 +1219,9 @@ - sed is powerfull, use it instead using several pipes - use usleep for waiting on events - use the settimeofday feature to warp the system clock for - systems which use the localtime in the UTC + systems which use the localtime in the UTC (bnc#550697) - add scripts from aaa_base for loading rtc module and warp - the clock for systems with local time in RTC + the clock for systems with local time in RTC (bnc#550697) ------------------------------------------------------------------- Mon Feb 9 09:56:22 CET 2009 - bwalle@suse.de @@ -1282,7 +1319,7 @@ Thu Jan 08 18:16:29 CET 2009 - bwalle@suse.de - Fix handling of minor device numbers greater than 255 - (bnc #447968). + (bnc #447968, bnc#471815, bnc#634053). ------------------------------------------------------------------- Thu Jan 08 11:07:14 CET 2009 - bwalle@suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/mkinitrd new/mkinitrd-2.8.0/sbin/mkinitrd --- old/mkinitrd-2.7.2/sbin/mkinitrd 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/sbin/mkinitrd 2013-09-24 17:17:48.000000000 +0200 @@ -20,7 +20,7 @@ # git://git.opensuse.org/projects/mkinitrd.git # -VERSION=2.7.2 +VERSION=2.8.0 LOGDIR=/var/log/YaST2 LOGFILE=$LOGDIR/mkinitrd.log PATH=/sbin:/usr/sbin:$PATH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-start.sh new/mkinitrd-2.8.0/scripts/boot-start.sh --- old/mkinitrd-2.7.2/scripts/boot-start.sh 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/boot-start.sh 2013-09-24 17:17:48.000000000 +0200 @@ -38,6 +38,7 @@ ## ## console the device we should redirect the output to (ttyS0 for serial console) ## linuxrc=trace activates debugging for the initrd process +## tmpfs_options tmpfs extra mount options (for /dev) ## [module].param=value sets a kernel module parameter ## @@ -73,11 +74,11 @@ mount -t proc proc /proc mount -t sysfs sysfs /sys -if mount -t devtmpfs -o mode=0755,nr_inodes=0 devtmpfs /dev; then +if mount -t devtmpfs -o mode=0755,nr_inodes=0${tmpfs_options:+,$tmpfs_options} devtmpfs /dev; then have_devtmpfs=true else have_devtmpfs=false - mount -t tmpfs -o mode=0755,nr_inodes=0 udev /dev + mount -t tmpfs -o mode=0755,nr_inodes=0${tmpfs_options:+,$tmpfs_options} udev /dev mknod -m 0666 /dev/tty c 5 0 mknod -m 0600 /dev/console c 5 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-storage.sh new/mkinitrd-2.8.0/scripts/boot-storage.sh --- old/mkinitrd-2.7.2/scripts/boot-storage.sh 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/boot-storage.sh 2013-09-24 17:17:48.000000000 +0200 @@ -15,7 +15,7 @@ ## ----------------------- ## ## root the root device (the device /bin/init is on) -## nfsroot alias for root +## nfsroot nfs root if root=/dev/nfs, otherwise alias for root ## resume the resume device (the device software suspend puts its image to) ## journal the journaling device (if journaling is being done on a seperate device) ## @@ -27,8 +27,8 @@ rootdev="$root" fi -if [ "$nfsroot" ]; then - rootdev=$nfsroot +if [ -n "$nfsroot" -a -z "$root" ]; then + rootdev=/dev/nfs fi [ "$resume" ] && resumedev="$resume" @@ -46,6 +46,10 @@ md_dev=$rootdev md_minor=${rootdev#/dev/md} ;; + /dev/nfs) + rootfstype="nfs" + rootdev=$nfsroot + ;; /dev/*) ;; LABEL=*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-scsi_dh.sh new/mkinitrd-2.8.0/scripts/setup-scsi_dh.sh --- old/mkinitrd-2.7.2/scripts/setup-scsi_dh.sh 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/setup-scsi_dh.sh 2013-09-24 17:17:48.000000000 +0200 @@ -5,9 +5,13 @@ # Include all scsi_dh_* modules and load them on boot (bnc#727428 et al) scsi_dh_modules= -for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko"); do - i=${i%.ko} - scsi_dh_modules="$scsi_dh_modules ${i##*/}" -done +if test -d $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler +then + for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/scsi/device_handler -name "scsi[-_]dh[_-]*.ko") + do + i=${i%.ko} + scsi_dh_modules="$scsi_dh_modules ${i##*/}" + done +fi save_var scsi_dh_modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-start.sh new/mkinitrd-2.8.0/scripts/setup-start.sh --- old/mkinitrd-2.7.2/scripts/setup-start.sh 2013-09-18 20:13:48.000000000 +0200 +++ new/mkinitrd-2.8.0/scripts/setup-start.sh 2013-09-24 17:17:48.000000000 +0200 @@ -75,4 +75,5 @@ RESOLVED_INITRD_MODULES=$RESOLVED_INITRD_MODULES_NEW save_var RESOLVED_INITRD_MODULES +save_var tmpfs_options save_var RESOLVED_INITRD_MODULES_UDEV -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org