commit mkinitrd for openSUSE:Factory

2014-03-12 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2014-03-12 14:45:40

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.changes2013-10-31 
10:21:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2014-03-12 
14:45:41.0 +0100
@@ -1,0 +2,15 @@
+Tue Jan 14 12:25:42 CET 2014 - h...@suse.de
+
+- Add cciss compat rules to mkinitrd (bnc#858663)
+
+---
+Thu Dec 19 18:55:23 UTC 2013 - ldun...@suse.com
+
+- Support second ibft iscsi interface (bnc#830968)
+
+---
+Fri Nov 29 13:58:34 CET 2013 - h...@suse.de
+
+- Wait for multipath devices when MD is active (bnc#848293).
+
+---
@@ -203,0 +219,5 @@
+
+---
+Mon May 13 19:10:09 UTC 2013 - mma...@suse.com
+
+- Do not overwrite the drvlink variable (bnc#803760)



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.tXTyQw/_old  2014-03-12 14:45:42.0 +0100
+++ /var/tmp/diff_new_pack.tXTyQw/_new  2014-03-12 14:45:42.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mkinitrd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes 
new/mkinitrd-2.8.1/mkinitrd.changes
--- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-29 18:31:03.0 +0100
+++ new/mkinitrd-2.8.1/mkinitrd.changes 2014-02-05 17:51:01.0 +0100
@@ -1,4 +1,19 @@
 ---
+Tue Jan 14 12:25:42 CET 2014 - h...@suse.de
+
+- Add cciss compat rules to mkinitrd (bnc#858663)
+
+---
+Thu Dec 19 18:55:23 UTC 2013 - ldun...@suse.com
+
+- Support second ibft iscsi interface (bnc#830968)
+
+---
+Fri Nov 29 13:58:34 CET 2013 - h...@suse.de
+
+- Wait for multipath devices when MD is active (bnc#848293).
+
+---
 Tue Oct 29 18:25:41 CET 2013 - oher...@suse.de
 
 - Fix code which handles missing or incomplete fstab (bnc#848038)
@@ -203,6 +218,11 @@
 - Package 61-msft.rules and sg_inq (bnc#805059)
 
 ---
+Mon May 13 19:10:09 UTC 2013 - mma...@suse.com
+
+- Do not overwrite the drvlink variable (bnc#803760)
+
+---
 Fri May 10 12:28:01 UTC 2013 - ptesa...@suse.cz
 
 - s390x: add support for scm devices (bnc#814540)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 
new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh
--- old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2013-10-29 
18:31:03.0 +0100
+++ new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2014-02-05 
17:51:01.0 +0100
@@ -100,6 +100,10 @@
 retval=0
 break;
 fi
+elif [ -x $(type -p multipath) -a -z $cmd_root_no_mpath ] ; 
then
+echo -n !
+multipath -v 0
+wait_for_events
 fi
 usleep 25000
 ((timeout % 40 == 1))  echo -n .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-ibft.sh 
new/mkinitrd-2.8.1/scripts/boot-ibft.sh
--- old/mkinitrd-2.8.1/scripts/boot-ibft.sh 2013-10-29 18:31:03.0 
+0100
+++ new/mkinitrd-2.8.1/scripts/boot-ibft.sh 2014-02-05 17:51:01.0 
+0100
@@ -13,22 +13,24 @@
 load_modules
 
 ibft_get_att() {
-if [ -f $ibft_nic/$1 ]; then
-   cat $ibft_nic/$1
+local attr=$1 nic=$2
+
+if [ -f $nic/$attr ]; then
+   cat $nic/$attr
 else
echo 
 fi
 }
 
 ibft_get_ethdev() {
-local iface
+local iface nic=$1
 
-if test -d $ibft_nic/device/net ; then
-   for iface in $ibft_nic/device/net/*/addr_len; do
+if test -d $nic/device/net ; then
+  

commit mkinitrd for openSUSE:Factory

2013-10-31 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-31 10:21:09

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.changes2013-10-29 
09:28:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-31 
10:21:11.0 +0100
@@ -1,0 +2,5 @@
+Tue Oct 29 18:25:41 CET 2013 - oher...@suse.de
+
+- Fix code which handles missing or incomplete fstab (bnc#848038)
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes 
new/mkinitrd-2.8.1/mkinitrd.changes
--- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-27 21:29:16.0 +0100
+++ new/mkinitrd-2.8.1/mkinitrd.changes 2013-10-29 18:31:03.0 +0100
@@ -1,4 +1,9 @@
 ---
+Tue Oct 29 18:25:41 CET 2013 - oher...@suse.de
+
+- Fix code which handles missing or incomplete fstab (bnc#848038)
+
+---
 Sun Oct 27 21:24:20 CET 2013 - oher...@suse.de
 
 - Resolve also library dependencies of libnss (bnc#847785)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-storage.sh 
new/mkinitrd-2.8.1/scripts/setup-storage.sh
--- old/mkinitrd-2.8.1/scripts/setup-storage.sh 2013-10-27 21:29:16.0 
+0100
+++ new/mkinitrd-2.8.1/scripts/setup-storage.sh 2013-10-29 18:31:03.0 
+0100
@@ -308,6 +308,13 @@
 dev=${!var_dev}
 fi
 
+#if any of the above fails, use whats currently in use for the mountpoint
+if [ -z $fstype -a -z $dev ] ; then
+grep -E ^[^[:space:]]+ $mountpoint   /proc/mounts | tail -n 1  
$work_dir/pipe
+# get device, type and options from current state
+read dev dummy fstype fsopts dummy  $work_dir/pipe
+fi
+
 #if we don't know where the device belongs to
 if [ -z $fstype ] ; then
   # get type from /etc/fstab or /proc/mounts (actually not needed)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-10-29 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-29 09:28:28

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.changes2013-10-17 
17:42:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-29 
09:28:30.0 +0100
@@ -1,0 +2,5 @@
+Sun Oct 27 21:24:20 CET 2013 - oher...@suse.de
+
+- Resolve also library dependencies of libnss (bnc#847785)
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes 
new/mkinitrd-2.8.1/mkinitrd.changes
--- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-17 11:13:41.0 +0200
+++ new/mkinitrd-2.8.1/mkinitrd.changes 2013-10-27 21:29:16.0 +0100
@@ -1,4 +1,9 @@
 ---
+Sun Oct 27 21:24:20 CET 2013 - oher...@suse.de
+
+- Resolve also library dependencies of libnss (bnc#847785)
+
+---
 Thu Oct 17 11:13:30 CEST 2013 - oher...@suse.de
 
 - Version 2.8.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-sharedlibs.sh 
new/mkinitrd-2.8.1/scripts/setup-sharedlibs.sh
--- old/mkinitrd-2.8.1/scripts/setup-sharedlibs.sh  2013-10-17 
11:13:41.0 +0200
+++ new/mkinitrd-2.8.1/scripts/setup-sharedlibs.sh  2013-10-27 
21:29:16.0 +0100
@@ -26,7 +26,7 @@
 # Resolve dynamic library dependencies. Returns a list of symbolic links
 # to shared objects and shared object files for the binaries in $*.
 shared_object_files() {
-local CHROOT initrd_libs lib_files lib_links lib link
+local initrd_libs lib link
 
 initrd_libs=( $(ldd_files $@) )
 
@@ -64,48 +64,58 @@
 done
 }
 
-verbose -ne Shared libs:\t
-# Copy all required shared libraries and the symlinks that
-# refer to them.
-lib_files=$(shared_object_files ${initrd_bins[@]})
-[ $? -eq 0 ] || return 1
-if [ -n $lib_files ]; then
-for lib in $lib_files; do
-[ -L $root_dir/$lib ] || verbose -n $lib 
-( cd ${root_dir:-/} ; cp -dp --parents $lib $tmp_mnt )
-done
-lib_files=
+copy_shared_libs() {
+local bins=( $@ )
+local extra_lib_files lib_files lib i
+
+# First see what nss and other libs are required. This can be 64bit or 
32bit,
+# depending on the host and the already copied binaries.
 case $(uname -m) in
 ia64)
+# this is a known location
 mkdir -p $tmp_mnt/lib
-lib_files=$lib_files `echo $root_dir/lib/libnss_{dns,files}* 
$root_dir/lib/lib{gcc_s,unwind}.so*`
+extra_lib_files=`echo $root_dir/lib/libnss_{dns,files}* 
$root_dir/lib/lib{gcc_s,unwind}.so*`
 ;;
 *)
-# no symlinks, most point into the running system
-for i in `LANG=C LC_ALL=C file -b 
$tmp_mnt/{,usr/}{lib*/udev/,{,s}bin}/* | sed -n 's/^ELF \([0-9][0-9]-bit\) 
.*/\1/p' | sort -u`
+# Skip symlinks, they may point into the running system instead of 
$tmp_mnt
+for i in `LANG=C LC_ALL=C file -b 
$tmp_mnt/{,usr/}{lib*/udev,{,s}bin}/* | sed -n 's/^ELF \([0-9][0-9]-bit\) 
.*/\1/p' | sort -u`
 do
 case $i in
 32-bit)
 mkdir -p $tmp_mnt/lib
-lib_files=$lib_files `echo 
$root_dir/lib/libnss_{dns,files}* $root_dir/lib/libgcc_s.so*`
+extra_lib_files=$extra_lib_files `echo 
$root_dir/lib/libnss_{dns,files}* $root_dir/lib/libgcc_s.so*`
 ;;
 64-bit)
 mkdir -p $tmp_mnt/lib64
-lib_files=$lib_files `echo 
$root_dir/lib64/libnss_{dns,files}* $root_dir/lib64/libgcc_s.so*`
+extra_lib_files=$extra_lib_files `echo 
$root_dir/lib64/libnss_{dns,files}* $root_dir/lib64/libgcc_s.so*`
 ;;
 esac
 done
 ;;
 esac
 
-for lib in $lib_files ; do
-if [ -f $lib ] ; then
-verbose -n ${lib##$root_dir/} 
-cp -dp --parents $lib $tmp_mnt
+verbose -ne Shared libs:\t
+
+# Now collect a list of libraries on which the binaries and extra libs 
depend on
+lib_files=$( shared_object_files ${bins[@]} $extra_lib_files )
+if [ $? -eq 0 ]
+then
+if [ -n $lib_files ]
+then
+  

commit mkinitrd for openSUSE:Factory

2013-10-17 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-17 17:03:11

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.changes2013-10-11 
15:35:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-17 
17:42:21.0 +0200
@@ -1,0 +2,23 @@
+Thu Oct 17 11:13:30 CEST 2013 - oher...@suse.de
+
+- Version 2.8.1
+
+---
+Thu Oct 17 11:03:47 CEST 2013 - rmila...@suse.com
+
+- Add support for predictable network interface names (bnc#820407)
+
+---
+Tue Oct 15 12:48:36 CEST 2013 - mma...@suse.cz
+
+-  Add support for root_no_dm=1 and root_no_mpath=1 kernel
+   commandline options to tell the initrd not to insist that the
+   root device be device-mapper or multipath, respectively.
+   (bnc#815185)
+
+---
+Tue Oct 15 12:32:27 CEST 2013 - ptesa...@suse.com
+
+- Add eadm_sch module to initrd for scm devices (bnc#820690)
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.TA5HaW/_old  2013-10-17 17:42:22.0 +0200
+++ /var/tmp/diff_new_pack.TA5HaW/_new  2013-10-17 17:42:22.0 +0200
@@ -41,7 +41,7 @@
 %else
 Requires:   sysvinit
 %endif
-Version:2.8.0
+Version:2.8.1
 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.8.0/mkinitrd.changes 
new/mkinitrd-2.8.1/mkinitrd.changes
--- old/mkinitrd-2.8.0/mkinitrd.changes 2013-10-11 12:58:10.0 +0200
+++ new/mkinitrd-2.8.1/mkinitrd.changes 2013-10-17 11:13:41.0 +0200
@@ -1,4 +1,27 @@
 ---
+Thu Oct 17 11:13:30 CEST 2013 - oher...@suse.de
+
+- Version 2.8.1
+
+---
+Thu Oct 17 11:03:47 CEST 2013 - rmila...@suse.com
+
+- Add support for predictable network interface names (bnc#820407)
+
+---
+Tue Oct 15 12:48:36 CEST 2013 - mma...@suse.cz
+
+-  Add support for root_no_dm=1 and root_no_mpath=1 kernel
+   commandline options to tell the initrd not to insist that the
+   root device be device-mapper or multipath, respectively.
+   (bnc#815185)
+
+---
+Tue Oct 15 12:32:27 CEST 2013 - ptesa...@suse.com
+
+- Add eadm_sch module to initrd for scm devices (bnc#820690)
+
+---
 Wed Oct  9 20:27:02 UTC 2013 - je...@suse.com
 
 - Add missing PCI USB HCI modules (bnc#839071).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/sbin/cmdinitrd 
new/mkinitrd-2.8.1/sbin/cmdinitrd
--- old/mkinitrd-2.8.0/sbin/cmdinitrd   2013-10-11 12:58:10.0 +0200
+++ new/mkinitrd-2.8.1/sbin/cmdinitrd   2013-10-17 11:13:41.0 +0200
@@ -16,7 +16,7 @@
 
 # This file is kept in the following git repository:
 #
-# git://git.opensuse.org/projects/mkinitrd.git
+# https://github.com/openSUSE/mkinitrd.git
 #
 
 usage() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/sbin/lsinitrd 
new/mkinitrd-2.8.1/sbin/lsinitrd
--- old/mkinitrd-2.8.0/sbin/lsinitrd2013-10-11 12:58:10.0 +0200
+++ new/mkinitrd-2.8.1/sbin/lsinitrd2013-10-17 11:13:41.0 +0200
@@ -16,7 +16,7 @@
 
 # This file is kept in the following git repository:
 #
-# git://git.opensuse.org/projects/mkinitrd.git
+# https://github.com/openSUSE/mkinitrd.git
 #
 
 usage() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/sbin/mkinitrd 
new/mkinitrd-2.8.1/sbin/mkinitrd
--- old/mkinitrd-2.8.0/sbin/mkinitrd2013-10-11 12:58:10.0 +0200
+++ new/mkinitrd-2.8.1/sbin/mkinitrd2013-10-17 11:13:41.0 +0200
@@ -17,10 +17,10 @@
 
 # This file is kept in the following git repository:
 #
-# git://git.opensuse.org/projects/mkinitrd.git
+# https://github.com/openSUSE/mkinitrd.git
 #
 
-VERSION=2.8.0
+VERSION=2.8.1
 LOGDIR=/var/log/YaST2
 LOGFILE=$LOGDIR/mkinitrd.log
 PATH=/sbin:/usr/sbin:$PATH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 

commit mkinitrd for openSUSE:Factory

2013-10-11 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-11 15:35:09

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.changes2013-10-04 
10:58:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-11 
15:35:10.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct  9 20:27:02 UTC 2013 - je...@suse.com
+
+- Add missing PCI USB HCI modules (bnc#839071).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/mkinitrd.changes 
new/mkinitrd-2.8.0/mkinitrd.changes
--- old/mkinitrd-2.8.0/mkinitrd.changes 2013-10-01 18:32:03.0 +0200
+++ new/mkinitrd-2.8.0/mkinitrd.changes 2013-10-11 12:58:10.0 +0200
@@ -1,4 +1,9 @@
 ---
+Wed Oct  9 20:27:02 UTC 2013 - je...@suse.com
+
+- Add missing PCI USB HCI modules (bnc#839071).
+
+---
 Tue Oct  1 18:30:59 CEST 2013 - oher...@suse.de
 
 - Include hyperv-keyboard if running in hyper-v guest (fate#315887)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/boot-usb.sh 
new/mkinitrd-2.8.0/scripts/boot-usb.sh
--- old/mkinitrd-2.8.0/scripts/boot-usb.sh  2013-10-01 18:32:03.0 
+0200
+++ new/mkinitrd-2.8.0/scripts/boot-usb.sh  2013-10-11 12:58:10.0 
+0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #%stage: device
-#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj hid-generic hid-holtek-kbd hid-lenovo-tpkbd hid-logitech-dj 
hid-ortek hid-roccat-arvo hid-roccat-isku hid-samsung hid-apple hid-belkin 
hid-cherry hid-ezkey hid-microsoft
+#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj hid-generic hid-holtek-kbd hid-lenovo-tpkbd hid-logitech-dj 
hid-ortek hid-roccat-arvo hid-roccat-isku hid-samsung hid-apple hid-belkin 
hid-cherry hid-ezkey hid-microsoft ehci-pci ohci-pci
 #%if: $use_usb
 #
 # usb module helper

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-10-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-04 10:58:08

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.changes2013-09-26 
19:38:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-04 
10:58:09.0 +0200
@@ -1,0 +2,10 @@
+Tue Oct  1 18:30:59 CEST 2013 - oher...@suse.de
+
+- Include hyperv-keyboard if running in hyper-v guest (fate#315887)
+
+---
+Tue Oct  1 15:56:32 UTC 2013 - mkube...@suse.cz
+
+- Fix iSCSI boot over IPv6 (bnc#830621)
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh 
new/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh
--- old/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh 2013-09-24 
17:17:48.0 +0200
+++ new/mkinitrd-2.8.0/lib/mkinitrd/bin/ipconfig.sh 2013-10-01 
18:32:03.0 +0200
@@ -28,12 +28,39 @@
 echo $prefix
 }
 
-ipcfg=$(echo $1 | sed 's/:/_:/g')
+parse_prefix() {
+local arg=$1
+
+case $arg in
+*.*)
+# a.b.c.d IPv4 address
+calc_prefix $arg
+;;
+/*)
+# /n
+arg=${arg:1}
+echo $[arg]
+;;
+*)
+# prefix length
+echo $[arg]
+;;
+esac
+}
+
+if [ ${1:0:1} = [ ]; then
+cfg=${1:1}
+client=${cfg%%]:*}
+cfg=${cfg#*]:}
+else
+client=${1%%:*}
+cfg=${1#*:}
+fi
+
+ipcfg=$(echo $cfg | sed 's/:/_:/g')
 
 set -- $(IFS=: ; echo $ipcfg )
 
-client=${1%%_}
-shift
 if [ $1 != _ ] ; then
 peer=${1%%_}
 fi
@@ -65,9 +92,12 @@
 prefix=${client%%*/}
 if [ $prefix == $client ] ; then
 if [ -n $netmask ] ; then
-prefix=$(calc_prefix $netmask)
+prefix=$(parse_prefix $netmask)
 else
-prefix=24
+case $client in
+*:*) prefix=64 ;;
+*)   prefix=24 ;;
+esac
 fi
 fi
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/mkinitrd.changes 
new/mkinitrd-2.8.0/mkinitrd.changes
--- old/mkinitrd-2.8.0/mkinitrd.changes 2013-09-24 17:17:48.0 +0200
+++ new/mkinitrd-2.8.0/mkinitrd.changes 2013-10-01 18:32:03.0 +0200
@@ -1,4 +1,14 @@
 ---
+Tue Oct  1 18:30:59 CEST 2013 - oher...@suse.de
+
+- Include hyperv-keyboard if running in hyper-v guest (fate#315887)
+
+---
+Tue Oct  1 15:56:32 UTC 2013 - mkube...@suse.cz
+
+- Fix iSCSI boot over IPv6 (bnc#830621)
+
+---
 Tue Sep 24 17:16:19 CEST 2013 - oher...@suse.de
 
 - Version 2.8.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/boot-ibft.sh 
new/mkinitrd-2.8.0/scripts/boot-ibft.sh
--- old/mkinitrd-2.8.0/scripts/boot-ibft.sh 2013-09-24 17:17:48.0 
+0200
+++ new/mkinitrd-2.8.0/scripts/boot-ibft.sh 2013-10-01 18:32:03.0 
+0200
@@ -59,7 +59,17 @@
 else
nettype='static'
 fi
-ip=$(ibft_get_att ip-addr)::$(ibft_get_att gateway):$(ibft_get_att 
subnet-mask):$ibft_hostname:$(ibft_get_ethdev):$nettype
+ipaddr=$(ibft_get_att ip-addr)
+case $ipaddr in
+*:*)
+netmask=64
+ipaddr=[$ipaddr]
+;;
+*)
+netmask=$(ibft_get_att subnet-mask)
+;;
+esac
+ip=$ipaddr::$(ibft_get_att 
gateway):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype
 interface=$(ibft_get_ethdev)
 macaddress=$(ibft_get_att mac)
 InitiatorName=$(ibft_get_initiatorname)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.0/scripts/boot-network.sh 
new/mkinitrd-2.8.0/scripts/boot-network.sh
--- old/mkinitrd-2.8.0/scripts/boot-network.sh  2013-09-24 17:17:48.0 
+0200
+++ new/mkinitrd-2.8.0/scripts/boot-network.sh  2013-10-01 18:32:03.0 
+0200
@@ -36,8 +36,15 @@
 
 ipconfig $ip
 # dhcp information emulation
-IPADDR=${ip%%:*}
-ip=${ip#*:} # first entry = peeraddr
+if [ ${ip:0:1} = [ ]; then
+# address in brackets (necessary for IPv6)
+ip=${ip:1}
+IPADDR=${ip%%]:*}
+ip=${ip#*]:}
+else
+

commit mkinitrd for openSUSE:Factory

2013-09-26 Thread h_root
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.changes2013-09-23 
10:05:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-09-26 
19:38:20.0 +0200
@@ -1,0 +2,22 @@
+Tue Sep 24 17:16:19 CEST 2013 - oher...@suse.de
+
+- Version 2.8.0
+
+---
+Tue Sep 24 16:29:51 CEST 2013 - oher...@suse.de
+
+- Add support for root=/dev/nfs (bnc#617830).
+
+---
+Tue Sep 24 15:32:46 CEST 2013 - oher...@suse.de
+
+- Add a support for tmpfs_options option on command line
+  (bnc#483965).
+
+---
+Sun Sep 22 19:19:25 CEST 2013 - oher...@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 - mvanc...@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 - mvanc...@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 - h...@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.0 +0200
+++ /var/tmp/diff_new_pack.saMVMN/_new  2013-09-26 19:38:21.0 +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.0 +0200
+++ new/mkinitrd-2.8.0/mkinitrd.changes 2013-09-24 17:17:48.0 +0200
@@ -1,4 +1,26 @@
 ---
+Tue Sep 24 17:16:19 CEST 2013 - oher...@suse.de
+
+- Version 2.8.0
+
+---
+Tue Sep 24 16:29:51 CEST 2013 - oher...@suse.de
+
+- Add support for root=/dev/nfs (bnc#617830).
+
+---
+Tue Sep 24 15:32:46 CEST 2013 - oher...@suse.de
+
+- Add a support for tmpfs_options option on command line
+  (bnc#483965).
+
+---
+Sun Sep 22 19:19:25 CEST 2013 - oher...@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 - oher...@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 - e...@freedesktop.org
 
-- Add support for KMS.
+- Add support for KMS. (bnc#560419)
 
 ---
 Tue Jan 19 11:34:09 CET 2010 - mma...@suse.cz
@@ -1051,9 +1073,14 @@
   find out and copy if a module requires firmware files 
 
 ---
+Tue Oct 27 16:11:46 CEST 2009 - mvanc...@suse.cz
+
+- Fix support for UUID= and LABEL= in /etc/fstab 

commit mkinitrd for openSUSE:Factory

2013-09-23 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-09-23 10:05:23

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.changes2013-09-13 
14:43:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-09-23 
10:05:24.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 18 15:48:09 CEST 2013 - oher...@suse.de
+
+- Conflicts with mdadm older than 3.3 after previous change (bnc#838777)
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.7iKxgU/_old  2013-09-23 10:05:26.0 +0200
+++ /var/tmp/diff_new_pack.7iKxgU/_new  2013-09-23 10:05:26.0 +0200
@@ -44,6 +44,7 @@
 Version:2.7.2
 Release:0
 Conflicts:  udev  118
+Conflicts:  mdadm  3.3
 Requires:   dhcpcd
 PreReq: %fillup_prereq
 Summary:Creates an Initial RAM Disk Image for Preloading Modules

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-09-12 11:50:11.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-09-18 20:13:48.0 +0200
@@ -1,4 +1,21 @@
 ---
+Wed Sep 18 15:48:09 CEST 2013 - oher...@suse.de
+
+- Conflicts with mdadm older than 3.3 after previous change (bnc#838777)
+
+---
+Thu Sep 12 01:02:49 UTC 2013 - nfbr...@suse.com
+
+- Two improvements for md
+  1/ Don't install the udev rules file 64-md-raid.rules.
+ It has been renamed to 2 different files, and the mdadm
+ package installs it now.
+  2/ Run mdadm -IRs at half-time when waiting for the root
+ device to appear.
+ This will start any newly-degraded array (weren't degraded
+ when machine was shut down).
+
+---
 Tue Sep  3 10:38:29 CEST 2013 - oher...@suse.de
 
 - Fix MODULES_LOADED_ON_BOOT migration, handle unset variable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.spec 
new/mkinitrd-2.7.2/mkinitrd.spec
--- old/mkinitrd-2.7.2/mkinitrd.spec2013-09-12 11:50:11.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.spec2013-09-18 20:13:48.0 +0200
@@ -44,6 +44,7 @@
 Version:@@VERSION@@
 Release:0
 Conflicts:  udev  118
+Conflicts:  mdadm  3.3
 Requires:   dhcpcd
 PreReq: %fillup_prereq
 Summary:Creates an Initial RAM Disk Image for Preloading Modules

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-09-13 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-09-13 14:43:51

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.changes2013-09-04 
13:59:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-09-13 
14:43:52.0 +0200
@@ -1,0 +2,12 @@
+Thu Sep 12 01:02:49 UTC 2013 - nfbr...@suse.com
+
+- Two improvements for md
+  1/ Don't install the udev rules file 64-md-raid.rules.
+ It has been renamed to 2 different files, and the mdadm
+ package installs it now.
+  2/ Run mdadm -IRs at half-time when waiting for the root
+ device to appear.
+ This will start any newly-degraded array (weren't degraded
+ when machine was shut down).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-devfunctions.sh 
new/mkinitrd-2.7.2/scripts/boot-devfunctions.sh
--- old/mkinitrd-2.7.2/scripts/boot-devfunctions.sh 2013-09-03 
10:39:47.0 +0200
+++ new/mkinitrd-2.7.2/scripts/boot-devfunctions.sh 2013-09-12 
11:50:11.0 +0200
@@ -67,6 +67,7 @@
 fi
 if [ -n $root ]; then
 echo -n Waiting for device $root to appear: 
+let halftime=$timeout/2
 while [ $timeout -gt 0 ]; do
 if [ -e $root ]; then
 udev_devn=$(devnumber $root)
@@ -101,6 +102,10 @@
 usleep 25000
 ((timeout % 40 == 1))  echo -n .
 let timeout--
+if [ $need_mdadm = 1 -a $timeout -eq $halftime ] ; then
+# time to start any newly-degraded md arrays
+mdadm -IRs
+fi
 # Recheck for LVM volumes
 if [ -n $vg_root -a -n $vg_roots ] ; then
 vgscan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh 
new/mkinitrd-2.7.2/scripts/setup-modules.sh
--- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-09-03 10:39:47.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-09-12 11:50:11.0 
+0200
@@ -55,14 +55,12 @@
 #   the kernel and then just loads the kernel module, we can safely include
 #   such modules on such systems in initrd.
 #
-#   The check is done by checking if 'ipv6.ko' is supported. Since we
-#   have to supported ipv6 for a very long period of time from now because
-#   it's our standard file system, and that module exists on every
-#   architecture and does not depend on the hardware and even exists in
-#   the base package of the kernel because we need it in a virtualised
-#   environment, that module is suitable for that check. I didn't know any
-#   better method of checking if the kernel is supported so I implemented
-#   that hack. Better than nothing. :-)
+#   The check is done by checking if 'loop.ko' is supported. Since we have
+#   supported loop for a very long period of time, and that module exists 
on
+#   every architecture and does not depend on the hardware, that module is
+#   suitable for that check. I didn't know any better method of checking if
+#   the kernel is supported so I implemented that hack. Better than 
nothing.
+#   :-)
 #
 # Parameters
 #   kernelver: the kernel version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-udev.sh 
new/mkinitrd-2.7.2/scripts/setup-udev.sh
--- old/mkinitrd-2.7.2/scripts/setup-udev.sh2013-09-03 10:39:47.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-udev.sh2013-09-12 11:50:11.0 
+0200
@@ -78,7 +78,6 @@
 61-msft.rules \
 62-dm_linear.rules \
 64-device-mapper.rules \
-64-md-raid.rules \
 79-kms.rules \
 80-drivers.rules; do
 if [ -f /usr/lib/udev/rules.d/$rule ]; then

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-09-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-09-04 13:59:49

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.changes2013-08-19 
10:51:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-09-04 
13:59:50.0 +0200
@@ -1,0 +2,33 @@
+Tue Sep  3 10:38:29 CEST 2013 - oher...@suse.de
+
+- Fix MODULES_LOADED_ON_BOOT migration, handle unset variable
+
+---
+Mon Sep  2 20:51:19 CEST 2013 - oher...@suse.de
+
+- Use loop instead of ipv6 in check_supported_kernel to avoid
+  bogus error in mkinitrd.log. loop will most likely remain a
+  module.
+
+---
+Mon Sep  2 19:46:02 CEST 2013 - oher...@suse.de
+
+- Fix mkinitrd -b dir without -k/i option (bnc#510767)
+
+---
+Mon Sep  2 13:02:07 UTC 2013 - mma...@suse.cz
+
+- Always include ipv6.ko when iBFT is used (bnc#830621)
+
+---
+Fri Aug 30 22:45:38 UTC 2013 - jeng...@inai.de
+
+- Do not ship boot.loadmodules for = 11.4 (includes SLE11),
+  because aaa_base owns it
+
+---
+Mon Aug 26 12:49:34 UTC 2013 - mma...@suse.com
+
+- Quote options when parsing them (bnc#835479).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.6mzjOF/_old  2013-09-04 13:59:51.0 +0200
+++ /var/tmp/diff_new_pack.6mzjOF/_new  2013-09-04 13:59:51.0 +0200
@@ -55,7 +55,7 @@
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
 # silently overwritten by the next submission.
-Url:http://gitorious.org/opensuse/mkinitrd
+Url:https://github.com/openSUSE/mkinitrd
 
 %description
 Mkinitrd creates file system images for use as initial RAM disk
@@ -130,7 +130,10 @@
 EOF
 %if 0%{?suse_version}  1230
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
+%if 0%{?suse_version}  1140
+# This file is in aaa_base in older versions
 install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/
+%endif
 install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels
 %endif
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
@@ -154,12 +157,14 @@
 %post
 %{fillup_only -an kernel}
 %if 0%{?suse_version}  1230
+%if 0%{?suse_version}  1140
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
+%endif
 %{fillup_and_insserv -f -Y purge-kernels}
 %endif
 %if 0%{?suse_version} = 1230
 %{remove_and_set -n kernel MODULES_LOADED_ON_BOOT}
-if test -n ${MODULES_LOADED_ON_BOOT}
+if test -n ${MODULES_LOADED_ON_BOOT} -a ${MODULES_LOADED_ON_BOOT} != no
 then
mkdir -vp /etc/modules-load.d/
f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf
@@ -200,7 +205,9 @@
 %dir /lib/mkinitrd/setup
 %config /etc/rpm/macros.mkinitrd
 %if 0%{?suse_version}  1230
+%if 0%{?suse_version}  1140
 /etc/init.d/boot.loadmodules
+%endif
 /etc/init.d/purge-kernels
 %endif
 %if 0%{?suse_version} = 1210

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-08-08 10:47:59.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-09-03 10:39:47.0 +0200
@@ -1,5 +1,38 @@
 ---
-Thu Aug  8 10:21:25 CEST 2013 - oher...@suse.de
+Tue Sep  3 10:38:29 CEST 2013 - oher...@suse.de
+
+- Fix MODULES_LOADED_ON_BOOT migration, handle unset variable
+
+---
+Mon Sep  2 20:51:19 CEST 2013 - oher...@suse.de
+
+- Use loop instead of ipv6 in check_supported_kernel to avoid
+  bogus error in mkinitrd.log. loop will most likely remain a
+  module.
+
+---
+Mon Sep  2 19:46:02 CEST 2013 - oher...@suse.de
+
+- Fix mkinitrd -b dir without -k/i option (bnc#510767)
+
+---
+Mon Sep  2 13:02:07 UTC 2013 - mma...@suse.cz
+
+- Always include ipv6.ko when iBFT is used (bnc#830621)
+
+---
+Fri Aug 30 22:45:38 UTC 2013 - jeng...@inai.de
+
+- Do 

commit mkinitrd for openSUSE:Factory

2013-08-19 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-08-19 10:51:32

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.changes2013-08-04 
23:52:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-08-19 
10:51:34.0 +0200
@@ -1,0 +2,10 @@
+Thu Aug  8 10:31:25 CEST 2013 - oher...@suse.de
+
+- Include /etc/e2fsck.conf to get broken_system_clock=1 (bnc#775268)
+
+---
+Thu Aug  8 08:30:17 UTC 2013 - mma...@suse.cz
+
+- Include modules.order in the initrd.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 16:30:17.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-08-08 10:47:59.0 +0200
@@ -1,4 +1,14 @@
 ---
+Thu Aug  8 10:21:25 CEST 2013 - oher...@suse.de
+
+- Include /etc/e2fsck.conf to get broken_system_clock=1 (bnc#775268)
+
+---
+Thu Aug  8 08:30:17 UTC 2013 - mma...@suse.cz
+
+- Include modules.order in the initrd.
+
+---
 Sun Aug  4 16:29:03 CEST 2013 - oher...@suse.de
 
 - Print copied firmware files only once
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh 
new/mkinitrd-2.7.2/scripts/setup-modules.sh
--- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-04 16:30:17.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-08 10:47:59.0 
+0200
@@ -366,9 +366,11 @@
 
 if [ $resolved_modules ] ; then
 [ ! -d $tmp_mnt/lib/modules/$kernel_version ]  oops 10 No modules have 
been installed
-if test -e /lib/modules/$kernel_version/modules.builtin; then
-   cp $_ $tmp_mnt/lib/modules/$kernel_version/
-fi
+for f in /lib/modules/$kernel_version/modules.{builtin,order}; do
+if test -e $f; then
+cp $f $tmp_mnt/lib/modules/$kernel_version/
+fi
+done
 depmod -b $tmp_mnt -e -F $map $kernel_version
 fi
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-mount.sh 
new/mkinitrd-2.7.2/scripts/setup-mount.sh
--- old/mkinitrd-2.7.2/scripts/setup-mount.sh   2013-08-04 16:30:17.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-mount.sh   2013-08-08 10:47:59.0 
+0200
@@ -27,6 +27,10 @@
 break
 fi
 done
+if test -e /etc/e2fsck.conf
+then
+   cp -aL $_ $tmp_mnt$_
+fi
 
 save_var rootdev
 save_var rootfsck

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-08-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-08-04 16:58:27

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.changes2013-08-01 
06:54:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-08-04 
16:58:28.0 +0200
@@ -1,0 +2,11 @@
+Sun Aug  4 10:47:08 CEST 2013 - oher...@suse.de
+
+- Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959)
+
+---
+Wed Jul 31 19:47:41 CEST 2013 - oher...@suse.de
+
+- Migrate /etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT to
+  /etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf (bnc#768423)
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.q0qeb7/_old  2013-08-04 16:58:29.0 +0200
+++ /var/tmp/diff_new_pack.q0qeb7/_new  2013-08-04 16:58:29.0 +0200
@@ -109,8 +109,6 @@
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/setup
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/boot
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/bin
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp -a scripts/*.sh $RPM_BUILD_ROOT/lib/mkinitrd/scripts/
 for i in lib/mkinitrd/bin/*
 do
@@ -130,8 +128,12 @@
 #
 %install_mkinitrd   /usr/bin/perl /sbin/mkinitrd_setup
 EOF
+%if 0%{?suse_version}  1230
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/
 install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels
+%endif
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
 %if 0%{?suse_version} = 1210
@@ -151,8 +153,27 @@
 
 %post
 %{fillup_only -an kernel}
+%if 0%{?suse_version}  1230
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
 %{fillup_and_insserv -f -Y purge-kernels}
+%endif
+%if 0%{?suse_version} = 1230
+%{remove_and_set -n kernel MODULES_LOADED_ON_BOOT}
+if test -n ${MODULES_LOADED_ON_BOOT}
+then
+   mkdir -vp /etc/modules-load.d/
+   f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf
+   if test -f ${f}
+   then
+   echo ${f} already exists. Module list: 
'${MODULES_LOADED_ON_BOOT}'
+   else
+   for mod in ${MODULES_LOADED_ON_BOOT}
+   do
+   echo ${mod}
+   done  ${f}
+   fi
+fi
+%endif
 %if 0%{?suse_version} = 1210
 %service_add_post purge-kernels.service
 %endif
@@ -178,8 +199,10 @@
 %dir /lib/mkinitrd/boot
 %dir /lib/mkinitrd/setup
 %config /etc/rpm/macros.mkinitrd
+%if 0%{?suse_version}  1230
 /etc/init.d/boot.loadmodules
 /etc/init.d/purge-kernels
+%endif
 %if 0%{?suse_version} = 1210
 %_unitdir/purge-kernels.service
 %endif

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd 
new/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd
--- old/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd2013-07-31 
17:44:01.0 +0200
+++ new/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd2013-08-04 
10:47:54.0 +0200
@@ -31,16 +31,6 @@
 #
 DOMU_INITRD_MODULES=xennet xenblk
 
-## Type:   string
-## ServiceRestart: boot.loadmodules
-#
-# This variable contains the list of modules to be loaded
-# once the main filesystem is active
-# You will find a few default modules for hardware which
-# can not be detected automatically.
-#
-MODULES_LOADED_ON_BOOT=
-
 ## Type:string
 ## Default: 
 #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-07-31 17:44:01.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 10:47:54.0 +0200
@@ -1,4 +1,15 @@
 ---
+Sun Aug  4 10:47:08 CEST 2013 - oher...@suse.de
+
+- Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959)
+
+---
+Wed Jul 31 19:47:41 CEST 2013 - oher...@suse.de
+
+- Migrate /etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT to
+  /etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf (bnc#768423)
+
+---
 Wed Jul 31 17:42:59 CEST 2013 - oher...@suse.de
 
 - Remove useless console output before starting splash 

commit mkinitrd for openSUSE:Factory

2013-08-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-08-04 20:40:43

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.changes2013-08-04 
16:58:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-08-04 
23:52:30.0 +0200
@@ -1,0 +2,10 @@
+Sun Aug  4 16:29:03 CEST 2013 - oher...@suse.de
+
+- Print copied firmware files only once
+
+---
+Sun Aug  4 16:27:35 CEST 2013 - oher...@suse.de
+
+- Include firmware files only once, in /lib/firmware (bnc#713126)
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 10:47:54.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 16:30:17.0 +0200
@@ -1,4 +1,14 @@
 ---
+Sun Aug  4 16:29:03 CEST 2013 - oher...@suse.de
+
+- Print copied firmware files only once
+
+---
+Sun Aug  4 16:27:35 CEST 2013 - oher...@suse.de
+
+- Include firmware files only once, in /lib/firmware (bnc#713126)
+
+---
 Sun Aug  4 10:47:08 CEST 2013 - oher...@suse.de
 
 - Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh 
new/mkinitrd-2.7.2/scripts/setup-modules.sh
--- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-04 10:47:54.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-04 16:30:17.0 
+0200
@@ -320,6 +320,10 @@
 
 # Copy all modules into the initrd
 has_firmware=false
+declare -A fw_array
+mkdir -p $tmp_mnt/lib/firmware
+mkdir -p $tmp_mnt/usr/lib
+ln -sfbn ../../lib/firmware $tmp_mnt/usr/lib/firmware
 for module in $resolved_modules; do
 if [ ! -r $root_dir/$module ]; then
 oops 9 Module $module not found.
@@ -340,7 +344,11 @@
 echo -ne Firmware:\t
has_firmware=true
 fi
-echo -n $fw 
+if test -z ${fw_array[$fw]}
+then
+fw_array[$fw]=$fw
+echo -n $fw 
+fi
 if test -e $dir/$subdir/$fw.sig; then
 cp -p --parents $_ $tmp_mnt
 echo -n $fw.sig 
@@ -354,6 +362,7 @@
 echo
 fi
 unset has_firmware
+unset fw_array
 
 if [ $resolved_modules ] ; then
 [ ! -d $tmp_mnt/lib/modules/$kernel_version ]  oops 10 No modules have 
been installed

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-07-31 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-08-01 06:54:32

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.changes2013-07-03 
16:51:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-08-01 
06:54:34.0 +0200
@@ -1,0 +2,31 @@
+Wed Jul 31 17:42:59 CEST 2013 - oher...@suse.de
+
+- Remove useless console output before starting splash (doing fast
+  boot, Creating device nodes with udev) (bnc#775982)
+
+---
+Wed Jul 31 17:33:48 CEST 2013 - oher...@suse.de
+
+- Fix parsing of /etc/sysconfig/initrd (bnc#717590)
+
+---
+Wed Jul 31 17:21:07 CEST 2013 - oher...@suse.de
+
+- Fix parsing of disabled modules in INTRD_MODULES (bnc#696959)
+
+---
+Wed Jul 31 16:59:53 CEST 2013 - oher...@suse.de
+
+- Add blacklist for unused /usr/lib/udev helpers (bnc#757706)
+
+---
+Tue Jul 16 11:12:11 CEST 2013 - oher...@suse.de
+
+- Preserve existing /etc/nsswitch.conf in boot-network.sh
+
+---
+Tue Jul 16 10:46:21 CEST 2013 - oher...@suse.de
+
+- Remove usage of absolute path to readlink
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/lib/mkinitrd/bin/linuxrc 
new/mkinitrd-2.7.2/lib/mkinitrd/bin/linuxrc
--- old/mkinitrd-2.7.2/lib/mkinitrd/bin/linuxrc 2013-07-03 15:27:47.0 
+0200
+++ new/mkinitrd-2.7.2/lib/mkinitrd/bin/linuxrc 2013-07-31 17:44:01.0 
+0200
@@ -48,7 +48,6 @@
 }
 
 if [ ! $slow_boot ]; then
-  echo doing fast boot
   source run_all.sh
 else
   for file in boot/*; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-07-03 15:27:47.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-07-31 17:44:01.0 +0200
@@ -1,4 +1,35 @@
 ---
+Wed Jul 31 17:42:59 CEST 2013 - oher...@suse.de
+
+- Remove useless console output before starting splash (doing fast
+  boot, Creating device nodes with udev) (bnc#775982)
+
+---
+Wed Jul 31 17:33:48 CEST 2013 - oher...@suse.de
+
+- Fix parsing of /etc/sysconfig/initrd (bnc#717590)
+
+---
+Wed Jul 31 17:21:07 CEST 2013 - oher...@suse.de
+
+- Fix parsing of disabled modules in INTRD_MODULES (bnc#696959)
+
+---
+Wed Jul 31 16:59:53 CEST 2013 - oher...@suse.de
+
+- Add blacklist for unused /usr/lib/udev helpers (bnc#757706)
+
+---
+Tue Jul 16 11:12:11 CEST 2013 - oher...@suse.de
+
+- Preserve existing /etc/nsswitch.conf in boot-network.sh
+
+---
+Tue Jul 16 10:46:21 CEST 2013 - oher...@suse.de
+
+- Remove usage of absolute path to readlink
+
+---
 Wed Jul  3 15:25:44 CEST 2013 - schue...@gmx.net
 
 - Purge old kernels with low I/O priority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/mkinitrd 
new/mkinitrd-2.7.2/sbin/mkinitrd
--- old/mkinitrd-2.7.2/sbin/mkinitrd2013-07-03 15:27:47.0 +0200
+++ new/mkinitrd-2.7.2/sbin/mkinitrd2013-07-31 17:44:01.0 +0200
@@ -476,7 +476,7 @@
 save_var() {
 # sysconfig options override dynamically generated options
 if [ -e /etc/sysconfig/initrd ]; then
-local override=$(cat /etc/sysconfig/initrd | egrep \^$1=\)
+local override=$(egrep ^$1= /etc/sysconfig/initrd)
 if [ $override ]; then
 eval $override
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-network.sh 
new/mkinitrd-2.7.2/scripts/boot-network.sh
--- old/mkinitrd-2.7.2/scripts/boot-network.sh  2013-07-03 15:27:47.0 

commit mkinitrd for openSUSE:Factory

2013-07-03 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-07-03 16:51:56

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.changes2013-06-06 
15:00:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-07-03 
16:51:57.0 +0200
@@ -1,0 +2,7 @@
+Wed Jul  3 15:25:44 CEST 2013 - schue...@gmx.net
+
+- Purge old kernels with low I/O priority
+  As this is run directly at startup, it competes for I/O with the
+  other boot processes.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/etc/purge-kernels.service 
new/mkinitrd-2.7.2/etc/purge-kernels.service
--- old/mkinitrd-2.7.2/etc/purge-kernels.service2013-06-05 
21:27:18.0 +0200
+++ new/mkinitrd-2.7.2/etc/purge-kernels.service2013-07-03 
15:27:47.0 +0200
@@ -5,6 +5,8 @@
 
 [Service]
 Type=oneshot
+Nice=19
+IOSchedulingClass=idle
 ExecStartPre=/bin/rm -f /boot/do_purge_kernels
 ExecStart=/sbin/purge-kernels
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-06-05 21:27:18.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-07-03 15:27:47.0 +0200
@@ -1,4 +1,11 @@
 ---
+Wed Jul  3 15:25:44 CEST 2013 - schue...@gmx.net
+
+- Purge old kernels with low I/O priority
+  As this is run directly at startup, it competes for I/O with the
+  other boot processes.
+
+---
 Wed Jun  5 19:26:59 UTC 2013 - mma...@suse.com
 
 - Add hid modules that are no longer builtin

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-06-06 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-06-06 15:00:55

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.changes2013-06-05 
12:55:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-06-06 
15:00:56.0 +0200
@@ -1,0 +2,5 @@
+Wed Jun  5 19:26:59 UTC 2013 - mma...@suse.com
+
+- Add hid modules that are no longer builtin
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-05-28 17:22:08.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-06-05 21:27:18.0 +0200
@@ -1,4 +1,9 @@
 ---
+Wed Jun  5 19:26:59 UTC 2013 - mma...@suse.com
+
+- Add hid modules that are no longer builtin
+
+---
 Mon May 27 17:19:35 CEST 2013 - sch...@suse.de
 
 - add support for aarch64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-usb.sh 
new/mkinitrd-2.7.2/scripts/boot-usb.sh
--- old/mkinitrd-2.7.2/scripts/boot-usb.sh  2013-05-28 17:22:08.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/boot-usb.sh  2013-06-05 21:27:18.0 
+0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #%stage: device
-#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj hid-generic
+#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj hid-generic hid-holtek-kbd hid-lenovo-tpkbd hid-logitech-dj 
hid-ortek hid-roccat-arvo hid-roccat-isku hid-samsung hid-apple hid-belkin 
hid-cherry hid-ezkey hid-microsoft
 #%if: $use_usb
 #
 # usb module helper

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-06-05 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-06-05 12:55:50

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.changes2013-05-13 
15:09:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-06-05 
12:55:52.0 +0200
@@ -1,0 +2,15 @@
+Mon May 27 17:19:35 CEST 2013 - sch...@suse.de
+
+- add support for aarch64
+
+---
+Thu May 23 11:02:38 CEST 2013 - oher...@suse.de
+
+- Package 61-msft.rules and sg_inq (bnc#805059)
+
+---
+Fri May 10 12:28:01 UTC 2013 - ptesa...@suse.cz
+
+- s390x: add support for scm devices (bnc#814540)
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-05-06 15:39:34.0 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-05-28 17:22:08.0 +0200
@@ -1,4 +1,19 @@
 ---
+Mon May 27 17:19:35 CEST 2013 - sch...@suse.de
+
+- add support for aarch64
+
+---
+Thu May 23 11:02:38 CEST 2013 - oher...@suse.de
+
+- Package 61-msft.rules and sg_inq (bnc#805059)
+
+---
+Fri May 10 12:28:01 UTC 2013 - ptesa...@suse.cz
+
+- s390x: add support for scm devices (bnc#814540)
+
+---
 Mon May  6 15:39:12 CEST 2013 - ag...@suse.de
 
 - Find modalias for mmc driver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/mkinitrd 
new/mkinitrd-2.7.2/sbin/mkinitrd
--- old/mkinitrd-2.7.2/sbin/mkinitrd2013-05-06 15:39:34.0 +0200
+++ new/mkinitrd-2.7.2/sbin/mkinitrd2013-05-28 17:22:08.0 +0200
@@ -180,6 +180,9 @@
 arm*)
 regex='[uz]Image'
 ;;
+aarch64)
+regex='Image'
+;;
 *)  regex='vmlinu.'
 ;;
 esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-udev.sh 
new/mkinitrd-2.7.2/scripts/boot-udev.sh
--- old/mkinitrd-2.7.2/scripts/boot-udev.sh 2013-05-06 15:39:34.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/boot-udev.sh 2013-05-28 17:22:08.0 
+0200
@@ -2,6 +2,7 @@
 #%stage: boot
 #%depends: start dm
 #%programs: blkid
+#%programs: sg_inq
 #%programs: udevadm
 #%programs: udevd
 #%programs: uname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-block.sh 
new/mkinitrd-2.7.2/scripts/setup-block.sh
--- old/mkinitrd-2.7.2/scripts/setup-block.sh   2013-05-06 15:39:34.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-block.sh   2013-05-28 17:22:08.0 
+0200
@@ -154,6 +154,9 @@
 fio*)
 result=iomemory-vsl
 ;;
+   scm*)
+result=scm_block
+;;
 *)
 if [ ! -d /sys/block/$blkdev/device ] ; then
 echo Device $blkdev not handled 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-udev.sh 
new/mkinitrd-2.7.2/scripts/setup-udev.sh
--- old/mkinitrd-2.7.2/scripts/setup-udev.sh2013-05-06 15:39:34.0 
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-udev.sh2013-05-28 17:22:08.0 
+0200
@@ -30,6 +30,7 @@
 59-dasd.rules \
 60-persistent-storage.rules \
 60-persistent-input.rules \
+61-msft.rules \
 62-dm_linear.rules \
 64-device-mapper.rules \
 64-md-raid.rules \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2013-05-13 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-05-13 15:09:04

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.changes2013-04-23 
17:20:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-05-13 
15:09:05.0 +0200
@@ -2 +2 @@
-Mon Apr 22 14:43:49 UTC 2013 - wer...@suse.de
+Mon May  6 15:39:12 CEST 2013 - ag...@suse.de
@@ -4,2 +4,17 @@
-- Be sure that plymouth does not break emergency shell
-- Add sulogin and shadow password entry for root
+- Find modalias for mmc driver
+
+---
+Mon May  6 15:37:38 CEST 2013 - ag...@suse.de
+
+- include mmc drivers in monster initrd 
+
+---
+Thu May  2 13:56:26 UTC 2013 - rmila...@suse.com
+
+- setup-storage: Support /dev/md/ subdir
+
+---
+Wed Apr 10 12:57:27 CEST 2013 - wer...@suse.de
+
+- Switch plymouth and/or splash off before escaping to emergency
+  shell (bnc#809812)

Old:

  mkinitrd-2.7.2-sulogin.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.9zC5MJ/_old  2013-05-13 15:09:07.0 +0200
+++ /var/tmp/diff_new_pack.9zC5MJ/_new  2013-05-13 15:09:07.0 +0200
@@ -51,7 +51,6 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
-Patch0: mkinitrd-2.7.2-sulogin.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -86,7 +85,6 @@
 
 %prep
 %setup
-%patch0
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/man/mkinitrd.8.txt 
new/mkinitrd-2.7.2/man/mkinitrd.8.txt
--- old/mkinitrd-2.7.2/man/mkinitrd.8.txt   2013-03-21 15:43:57.0 
+0100
+++ new/mkinitrd-2.7.2/man/mkinitrd.8.txt   2013-05-06 15:39:34.0 
+0200
@@ -142,6 +142,9 @@
 but for example in a spec file to pre-generate an initrd or to  generate  a
 special  kdump  initrd (which *mkdumprd*(8) does).
 
+*-P*::
+Do not include the password of the super user (root).
+
 *-A*::
 Create  a so called monster initrd which includes all available features and
 modules.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-03-21 15:43:57.0 +0100
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-05-06 15:39:34.0 +0200
@@ -1,4 +1,25 @@
 ---
+Mon May  6 15:39:12 CEST 2013 - ag...@suse.de
+
+- Find modalias for mmc driver
+
+---
+Mon May  6 15:37:38 CEST 2013 - ag...@suse.de
+
+- include mmc drivers in monster initrd 
+
+---
+Thu May  2 13:56:26 UTC 2013 - rmila...@suse.com
+
+- setup-storage: Support /dev/md/ subdir
+
+---
+Wed Apr 10 12:57:27 CEST 2013 - wer...@suse.de
+
+- Switch plymouth and/or splash off before escaping to emergency
+  shell (bnc#809812)
+
+---
 Thu Mar 21 15:42:49 CET 2013 - arvidj...@gmail.com
 
 - fix wrong target dependency (local_fs - local-fs) (bnc#787075)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/mkinitrd 
new/mkinitrd-2.7.2/sbin/mkinitrd
--- old/mkinitrd-2.7.2/sbin/mkinitrd2013-03-21 15:43:57.0 +0100
+++ new/mkinitrd-2.7.2/sbin/mkinitrd2013-05-06 15:39:34.0 +0200
@@ -279,7 +279,7 @@
 {
 local dir st size last_size=0
 
-for dir in $TMPDIR /dev/shm /tmp /var/tmp; do
+for dir in ${TMPDIR:-/tmp} /dev/shm /tmp /var/tmp; do
 if test ! -w $dir; then
 continue
 fi
@@ -306,12 +306,13 @@
 }
 find_tmpdir
 
-work_dir=$(mktemp -qd $tmp_dir/${mkinit_name}.XX)
+work_dir=$(mktemp -qd $tmp_dir/${mkinit_name}.)
 if [ $? -ne 0 ]; then
 echo $0: Can't create temp dir, exiting. 2
 exit 1
 fi
-
+TMPDIR=$work_dir
+export 

commit mkinitrd for openSUSE:Factory

2013-04-23 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-04-23 17:20:18

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2013-04-05 
17:28:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-04-23 
17:20:21.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 22 14:43:49 UTC 2013 - wer...@suse.de
+
+- Be sure that plymouth does not break emergency shell
+- Add sulogin and shadow password entry for root
+
+---

New:

  mkinitrd-2.7.2-sulogin.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.imYvu5/_old  2013-04-23 17:20:26.0 +0200
+++ /var/tmp/diff_new_pack.imYvu5/_new  2013-04-23 17:20:26.0 +0200
@@ -51,6 +51,7 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
+Patch0: mkinitrd-2.7.2-sulogin.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -85,6 +86,7 @@
 
 %prep
 %setup
+%patch0
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-2.7.2-sulogin.patch ++
From a258757bce1debd35eba6f4e5b3f1f38f799b7c4 Mon Sep 17 00:00:00 2001
From: Werner Fink wer...@suse.de
Date: Wed, 10 Apr 2013 12:57:27 +0200
Subject: [PATCH] Switch plymouth and/or splash off before escaping to
 emergency shell

As well as use sulogin to have a emergency shell on all consoles and
to enable a password check.  For this check the initrd should be set
to be readable only by root to avoid that users can to spy on the
confidential data stored within the initrd.

Signed-off-by: Werner Fink wer...@suse.de
---
 man/mkinitrd.8.txt   |3 +++
 sbin/mkinitrd|7 ---
 scripts/boot-mount.sh|   12 +++-
 scripts/boot-network.sh  |4 +---
 scripts/boot-start.sh|   25 ++---
 scripts/setup-done.sh|   11 +++
 scripts/setup-prepare.sh |   42 +-
 7 files changed, 73 insertions(+), 31 deletions(-)

diff --git man/mkinitrd.8.txt man/mkinitrd.8.txt
index 88014be..03014e6 100644
--- man/mkinitrd.8.txt
+++ man/mkinitrd.8.txt
@@ -142,6 +142,9 @@ created.  This  is  useful if you call mkinitrd(8) not for 
the running system
 but for example in a spec file to pre-generate an initrd or to  generate  a
 special  kdump  initrd (which *mkdumprd*(8) does).
 
+*-P*::
+Do not include the password of the super user (root).
+
 *-A*::
 Create  a so called monster initrd which includes all available features and
 modules.
diff --git sbin/mkinitrd sbin/mkinitrd
index 42d5974..09db0e3 100755
--- sbin/mkinitrd
+++ sbin/mkinitrd
@@ -279,7 +279,7 @@ find_tmpdir()
 {
 local dir st size last_size=0
 
-for dir in $TMPDIR /dev/shm /tmp /var/tmp; do
+for dir in ${TMPDIR:-/tmp} /dev/shm /tmp /var/tmp; do
 if test ! -w $dir; then
 continue
 fi
@@ -306,12 +306,13 @@ find_tmpdir()
 }
 find_tmpdir
 
-work_dir=$(mktemp -qd $tmp_dir/${mkinit_name}.XX)
+work_dir=$(mktemp -qd $tmp_dir/${mkinit_name}.)
 if [ $? -ne 0 ]; then
 echo $0: Can't create temp dir, exiting. 2
 exit 1
 fi
-
+TMPDIR=$work_dir
+export TMPDIR
 
 saved_args=$@
 read_options
diff --git scripts/boot-mount.sh scripts/boot-mount.sh
index 8347303..7440e94 100644
--- scripts/boot-mount.sh
+++ scripts/boot-mount.sh
@@ -67,9 +67,7 @@ read_only=${cmd_ro}
 
 # And now for the real thing
 if ! discover_root ; then
-echo not found -- exiting to /bin/sh
-cd /
-PATH=$PATH PS1='$ ' sh -i
+emergency not found
 fi
 
 sysdev=$(udevadm info -q path -n $rootdev)
@@ -95,9 +93,7 @@ fi
 oacp=$(type -p on_ac_power)
 # check filesystem if possible
 if [ -z $rootfstype ]; then
-echo invalid root filesystem -- exiting to /bin/sh
-cd /
-PATH=$PATH PS1='$ ' sh -i
+emergency invalid root filesystem
 # skip fsck if running on battery  

   
 elif [ -n ${oacp} ]  ! ${oacp} -q ; then
 echo skipping fsck because running on batteries 
@@ -159,9 +155,7 @@ fi
 echo mount $opt $rootdev /root
 mount $opt $rootdev /root
 if [ $? -ne 0 ] ; then
-echo could not mount root filesystem -- exiting to 

commit mkinitrd for openSUSE:Factory

2013-03-22 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-03-22 12:04:52

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2013-02-04 
19:06:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-03-22 
12:04:53.0 +0100
@@ -2 +2 @@
-Fri Feb  1 17:46:57 UTC 2013 - wer...@suse.de
+Thu Mar 21 10:02:09 UTC 2013 - mma...@suse.cz
@@ -4,2 +4,49 @@
-- Fix boolean typo that is assume local time as default in warpclock
-  as we check for UTC in /etc/adjtime (related to bnc#779145) 
+- Use the default gzip compression level (bnc#809742).
+
+---
+Fri Mar 15 14:49:36 UTC 2013 - mma...@suse.cz
+
+- Do not refresh the bootloader if no kernels are installed
+  (bnc#804398).
+
+---
+Fri Mar 15 10:56:16 UTC 2013 - josef.moell...@ts.fujitsu.com
+
+- Skip static interfaces when configuring dhcp interfaces
+  (bnc#755642).
+
+---
+Fri Mar 15 10:42:01 UTC 2013 - h...@suse.de
+
+- Fix boot from mdraid on top of multipath devices (bnc#784613)
+
+---
+Tue Mar 12 16:17:20 CET 2013 - oher...@suse.de
+
+- Handle both rootfsopts and rootflags when looking for mount options
+
+---
+Wed Mar  6 19:40:12 CET 2013 - oher...@suse.de
+
+- Include hyperv_fb if running in hyper-v guest (fate#314862)
+
+---
+Wed Feb 27 19:41:38 CET 2013 - ag...@suse.de
+
+- Add support for zImage on ARM
+
+---
+Tue Feb 26 16:11:51 UTC 2013 - mma...@suse.cz
+
+- Fix typo in man lsinitrd.
+
+---
+Mon Feb 25 14:27:14 UTC 2013 - mma...@suse.cz
+
+- Do not tell the user to refresh the bootloader when generating the
+  kdump initrd. Also, fix the wording of the message (bnc#801984).
+
+---
+Fri Feb  1 19:04:15 CET 2013 - wer...@suse.de
+
+- Fix boolean typo that is assume local time as default in warpclock.
@@ -10,0 +58,6 @@
+
+---
+Mon Dec 17 14:55:27 UTC 2012 - ldun...@suse.com
+
+- Handle moving ibft interface between interfaces and subnets
+  (bnc#755642).

Old:

  mkinitrd-2.7.2.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.i1xIY9/_old  2013-03-22 12:04:54.0 +0100
+++ /var/tmp/diff_new_pack.i1xIY9/_new  2013-03-22 12:04:54.0 +0100
@@ -51,8 +51,6 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
-# PATCH-FIX-OPENSUSE mkinitrd-2.7.2.patch (bnc#779145)
-Patch0: mkinitrd-2.7.2.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -87,7 +85,6 @@
 
 %prep
 %setup
-%patch0
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/.gitignore 
new/mkinitrd-2.7.2/.gitignore
--- old/mkinitrd-2.7.2/.gitignore   2012-12-17 17:11:40.0 +0100
+++ new/mkinitrd-2.7.2/.gitignore   2013-03-21 11:16:00.0 +0100
@@ -1 +1,3 @@
 *.marks
+diff_*
+Session*.vim
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/build_rpm new/mkinitrd-2.7.2/build_rpm
--- old/mkinitrd-2.7.2/build_rpm2012-12-17 17:11:40.0 +0100
+++ new/mkinitrd-2.7.2/build_rpm2013-03-21 11:16:00.0 +0100
@@ -60,7 +60,15 @@
 exit 1
 fi
 
-rm -f $DESTDIR/*
+if test -f $DESTDIR/_link ; then
+osc_link=`mktemp`
+cat $DESTDIR/_link  $osc_link
+rm -f $DESTDIR/*
+cat $osc_link  $DESTDIR/_link
+rm -f $osc_link
+else
+rm -f $DESTDIR/*
+fi
 if ! mkdir -p $DESTDIR ; then
 echo Cannot create directory $DESTDIR
 exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/man/lsinitrd.8.txt 

commit mkinitrd for openSUSE:Factory

2013-02-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-02-04 19:06:35

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-12-31 
14:26:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-02-04 
19:06:37.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb  1 17:46:57 UTC 2013 - wer...@suse.de
+
+- Fix boolean typo that is assume local time as default in warpclock
+  as we check for UTC in /etc/adjtime (related to bnc#779145) 
+
+---

New:

  mkinitrd-2.7.2.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.sjvjx2/_old  2013-02-04 19:06:38.0 +0100
+++ /var/tmp/diff_new_pack.sjvjx2/_new  2013-02-04 19:06:38.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mkinitrd
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,6 +51,8 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
+# PATCH-FIX-OPENSUSE mkinitrd-2.7.2.patch (bnc#779145)
+Patch0: mkinitrd-2.7.2.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -85,6 +87,7 @@
 
 %prep
 %setup
+%patch0
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-2.7.2.patch ++
--- src/warpclock.c
+++ src/warpclock.c 2013-02-01 15:43:10.777952843 +
@@ -81,7 +81,7 @@ int main()
 struct timezone zone;
 time_t now, delta, gmtoff;
 struct stat st;
-int universal = 1;
+int universal = 0;
 int count, adj;
 
 err = warpclock: /etc/localtime;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-12-31 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-12-31 14:26:14

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-11-13 
10:09:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-12-31 
14:26:16.0 +0100
@@ -1,0 +2,10 @@
+Mon Dec 17 16:07:27 UTC 2012 - mma...@suse.cz
+
+- Fix typo in purge-kernels.service (bnc#792925).
+
+---
+Fri Dec  7 05:16:54 CET 2012 - j...@suse.com
+
+- mkinitrd: copy firmware signature files to initrd (fate#314574).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/etc/purge-kernels.service 
new/mkinitrd-2.7.2/etc/purge-kernels.service
--- old/mkinitrd-2.7.2/etc/purge-kernels.service2012-11-09 
18:38:03.0 +0100
+++ new/mkinitrd-2.7.2/etc/purge-kernels.service2012-12-17 
17:11:40.0 +0100
@@ -1,11 +1,11 @@
 [Unit]
 Description=Purge old kernels
 After=local_fs.target
-ConditionPathExists=/boot/do_pure_kernels
+ConditionPathExists=/boot/do_purge_kernels
 
 [Service]
 Type=oneshot
-ExecStartPre=/bin/rm -f /boot/do_pure_kernels
+ExecStartPre=/bin/rm -f /boot/do_purge_kernels
 ExecStart=/sbin/purge-kernels
 
 [Install]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes 
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2012-11-09 18:38:03.0 +0100
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2012-12-17 17:11:40.0 +0100
@@ -1,4 +1,14 @@
 ---
+Mon Dec 17 16:07:27 UTC 2012 - mma...@suse.cz
+
+- Fix typo in purge-kernels.service (bnc#792925).
+
+---
+Fri Dec  7 05:16:54 CET 2012 - j...@suse.com
+
+- mkinitrd: copy firmware signature files to initrd (fate#314574).
+
+---
 Fri Nov  9 18:37:49 CET 2012 - oher...@suse.de
 
 - Version 2.7.2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/lsinitrd 
new/mkinitrd-2.7.2/sbin/lsinitrd
--- old/mkinitrd-2.7.2/sbin/lsinitrd2012-11-09 18:38:03.0 +0100
+++ new/mkinitrd-2.7.2/sbin/lsinitrd2012-12-17 17:11:40.0 +0100
@@ -23,7 +23,8 @@
 echo Usage: lsinitrd [-l] [-h] [-c] initrd
 }
 
-config=0
+verbose=
+config=
 while [ $1 ] ; do
 case $1 in
 -l|--long)
@@ -76,7 +77,7 @@
 args=-t
 fi
 
-if [ $config -eq 1 ] ; then
+if [ $config ] ; then
 # yes, that's snow, but doesn't use any temporary files :)
 for configfile in $(uncomp $initrd | exec cpio --quiet -t | exec grep 
'^config/') ; do
 echo = $configfile 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh 
new/mkinitrd-2.7.2/scripts/setup-modules.sh
--- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2012-11-09 18:38:03.0 
+0100
+++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2012-12-17 17:11:40.0 
+0100
@@ -341,6 +341,10 @@
has_firmware=true
 fi
 echo -n $fw 
+if test -e $dir/$subdir/$fw.sig; then
+cp -p --parents $_ $tmp_mnt
+echo -n $fw.sig 
+fi
 fi
 done
 done

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-11-13 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-11-13 10:08:39

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-11-05 
15:32:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-11-13 
10:09:28.0 +0100
@@ -2 +2 @@
-Mon Nov  5 09:16:19 UTC 2012 - fcro...@suse.com
+Fri Nov  9 18:37:49 CET 2012 - oher...@suse.de
@@ -4,2 +4 @@
-- Update 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
-  to correctly handle udev from systemd 195.
+- Version 2.7.2.
@@ -8 +7 @@
-Fri Nov  2 10:39:06 UTC 2012 - idon...@suse.com
+Fri Nov  9 18:35:28 CET 2012 - oher...@suse.de
@@ -10,2 +9,13 @@
-- Add mkinitrd-get_kernel_version.patch to fix path for
-  get_kernel_version command.
+- put udev related files into /usr/lib/udev
+  create /lib/udev as symlink
+
+---
+Thu Nov  8 15:51:38 CET 2012 - oher...@suse.de
+
+- wrap _unitdir file list entry in a suse_version check
+
+---
+Thu Nov  8 15:41:34 CET 2012 - oher...@suse.de
+
+- remove blkid handling from setup-udev.sh
+  it is already handled in boot-udev.sh
@@ -22,2 +32,49 @@
-- Add 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch:
-  handle /lib/udev being a symlink.
+- handle udev from systemd 195.
+
+---
+Mon Oct  1 15:05:46 CEST 2012 - oher...@suse.de
+
+- install ipconfig.sh as ipconfig, so that only one copy gets
+  installed into the initrd
+
+---
+Mon Oct  1 14:40:31 CEST 2012 - oher...@suse.de
+
+- remove true(1) from program tags, functionality is provided by a script
+
+---
+Mon Oct  1 10:05:20 CEST 2012 - oher...@suse.de
+
+- replace cp_bin usage in setup-network.sh with programs tags
+
+---
+Sat Sep 29 23:33:58 CEST 2012 - oher...@suse.de
+
+- move some programs tags from boot-start.sh to boot-shell.sh
+- list all programs from linuxrc+ipconfig.sh in boot-start.sh
+
+---
+Sat Sep 29 23:22:23 CEST 2012 - oher...@suse.de
+
+- remove usage of absolute paths in programs tags
+
+---
+Sat Sep 29 22:34:07 CEST 2012 - oher...@suse.de
+
+- list all tools in boot-* scripts in a programs tag
+
+---
+Sat Sep 29 21:41:09 CEST 2012 - oher...@suse.de
+
+- remove usage of absolute paths for executables
+
+---
+Fri Sep 28 23:20:23 CEST 2012 - oher...@suse.de
+
+- update cp_bin to handle symlinks properly (bnc#778149)
+
+---
+Fri Sep 28 17:58:01 CEST 2012 - oher...@suse.de
+
+- remove suid/sgid from binaries right before creating the initrd
+- make binaries in all four bin directories executable

Old:

  0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
  mkinitrd-2.7.1-cmdinitrd.patch
  mkinitrd-get_kernel_version.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.clP1PE/_old  2012-11-13 10:09:32.0 +0100
+++ /var/tmp/diff_new_pack.clP1PE/_new  2012-11-13 10:09:32.0 +0100
@@ -41,7 +41,7 @@
 %else
 Requires:   sysvinit
 %endif
-Version:2.7.1
+Version:2.7.2
 Release:0
 Conflicts:  udev  118
 Requires:   dhcpcd
@@ -51,12 +51,6 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
-# PATCH-FIX-UPSTREAM 
0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch fcro...@suse.com -- 
handle /lib/udev being a symlink
-Patch0: 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
-# PATCH-FIX-UPSTREAM mkinitrd-2.7.1-cmdinitrd.patch wer...@suse.com -- add 
cmdinitrd to run commands on files in an initrd
-Patch1: mkinitrd-2.7.1-cmdinitrd.patch
-# Hack for 12.3-M1
-Patch2: mkinitrd-get_kernel_version.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -91,15 +85,11 @@
 
 %prep
 %setup
-%patch0 

commit mkinitrd for openSUSE:Factory

2012-11-05 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-11-05 15:32:29

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-11-02 
15:12:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-11-05 
15:32:42.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov  5 09:16:19 UTC 2012 - fcro...@suse.com
+
+- Update 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
+  to correctly handle udev from systemd 195.
+
+---



Other differences:
--
++ 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch ++
--- /var/tmp/diff_new_pack.pSpgTw/_old  2012-11-05 15:32:45.0 +0100
+++ /var/tmp/diff_new_pack.pSpgTw/_new  2012-11-05 15:32:45.0 +0100
@@ -18,7 +18,7 @@
  
 +# copy helper
 +if [ -d /usr/lib/udev ]; then
-+mkdir -p $tmp_mnt/usr/lib/udev $tmp_mnt/lib
++mkdir -p $tmp_mnt/usr/lib/udev $tmp_mnt/lib $tmp_mnt/usr/lib/systemd
 +ln -s -f ../usr/lib/udev $tmp_mnt/lib/udev
 +else
 +mkdir -p $tmp_mnt/lib/udev

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-11-02 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-11-02 15:12:14

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-10-19 
08:47:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-11-02 
15:12:15.0 +0100
@@ -1,0 +2,6 @@
+Fri Nov  2 10:39:06 UTC 2012 - idon...@suse.com
+
+- Add mkinitrd-get_kernel_version.patch to fix path for
+  get_kernel_version command.
+
+---

New:

  mkinitrd-get_kernel_version.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.E2Sxad/_old  2012-11-02 15:12:16.0 +0100
+++ /var/tmp/diff_new_pack.E2Sxad/_new  2012-11-02 15:12:16.0 +0100
@@ -55,6 +55,8 @@
 Patch0: 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
 # PATCH-FIX-UPSTREAM mkinitrd-2.7.1-cmdinitrd.patch wer...@suse.com -- add 
cmdinitrd to run commands on files in an initrd
 Patch1: mkinitrd-2.7.1-cmdinitrd.patch
+# Hack for 12.3-M1
+Patch2: mkinitrd-get_kernel_version.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -91,6 +93,7 @@
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-get_kernel_version.patch ++
Index: mkinitrd-2.7.1/sbin/mkinitrd
===
--- mkinitrd-2.7.1.orig/sbin/mkinitrd
+++ mkinitrd-2.7.1/sbin/mkinitrd
@@ -144,10 +144,10 @@ EOF
 kernel_version_from_image() {
 local kernel_image=$1 kernel_image_gz=${1//uImage/vmlinux}.gz
 
-if /sbin/get_kernel_version $kernel_image 2/dev/null; then
+if /usr/bin/get_kernel_version $kernel_image 2/dev/null; then
 return
 fi
-/sbin/get_kernel_version $kernel_image_gz 2/dev/null
+/usr/bin/get_kernel_version $kernel_image_gz 2/dev/null
 }
 
 default_kernel_images() {
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-10-19 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-10-19 08:47:40

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-08-04 
09:22:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-10-19 
08:47:41.0 +0200
@@ -1,0 +2,12 @@
+Thu Oct 18 12:36:10 UTC 2012 - wer...@suse.de
+
+- Add a new utility for running a command like diff or less on a
+  file in the initrd boot image 
+
+---
+Tue Oct 16 13:46:06 UTC 2012 - fcro...@suse.com
+
+- Add 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch:
+  handle /lib/udev being a symlink.
+
+---

New:

  0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
  mkinitrd-2.7.1-cmdinitrd.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.i5jS9P/_old  2012-10-19 08:47:43.0 +0200
+++ /var/tmp/diff_new_pack.i5jS9P/_new  2012-10-19 08:47:43.0 +0200
@@ -51,6 +51,10 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
+# PATCH-FIX-UPSTREAM 
0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch fcro...@suse.com -- 
handle /lib/udev being a symlink
+Patch0: 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
+# PATCH-FIX-UPSTREAM mkinitrd-2.7.1-cmdinitrd.patch wer...@suse.com -- add 
cmdinitrd to run commands on files in an initrd
+Patch1: mkinitrd-2.7.1-cmdinitrd.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -85,11 +89,14 @@
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/warpclock src/warpclock.c
 make -C man
+make -C man cmdinitrd.8
 sed -i s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/ 
sbin/mkinitrd
 echo Checking scripts:
 if ! bash -n sbin/mkinitrd; then
@@ -117,6 +124,7 @@
 install -D -m 644 man/mkinitrd.5 $RPM_BUILD_ROOT/%{_mandir}/man5/mkinitrd.5
 install -D -m 644 man/mkinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/mkinitrd.8
 install -D -m 644 man/lsinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/lsinitrd.8
+install -D -m 644 man/cmdinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/cmdinitrd.8
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 cat  $RPM_BUILD_ROOT/etc/rpm/macros.mkinitrd EOF
 #
@@ -178,6 +186,7 @@
 /lib/mkinitrd/scripts/*.sh
 /lib/mkinitrd/bin/*
 /bin/lsinitrd
+/bin/cmdinitrd
 /sbin/mkinitrd
 /sbin/mkinitrd_setup
 /sbin/module_upgrade
@@ -185,7 +194,8 @@
 /sbin/purge-kernels
 /var/adm/fillup-templates/sysconfig.kernel-%name
 %doc %{_mandir}/man5/mkinitrd.5.gz
-%doc %{_mandir}/man8/mkinitrd.8.gz
 %doc %{_mandir}/man8/lsinitrd.8.gz
+%doc %{_mandir}/man8/mkinitrd.8.gz
+%doc %{_mandir}/man8/cmdinitrd.8.gz
 
 %changelog

++ 0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch ++
From ceab9bc68cceaf924cd2abbec533bd2b9a1864bf Mon Sep 17 00:00:00 2001
From: Frederic Crozat fcro...@suse.com
Date: Fri, 5 Oct 2012 15:13:15 +0200
Subject: [PATCH] Handle /lib/udev being a symlink to /usr/lib/udev.
 Signed-off-by: Frederic Crozat fcro...@suse.com

---
 scripts/setup-udev.sh |   28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/scripts/setup-udev.sh b/scripts/setup-udev.sh
index c961b20..a9d5806 100644
--- a/scripts/setup-udev.sh
+++ b/scripts/setup-udev.sh
@@ -7,6 +7,21 @@
 # Default udev timeout is 30 seconds
 udev_timeout=30
 
+# copy helper
+if [ -d /usr/lib/udev ]; then
+mkdir -p $tmp_mnt/usr/lib/udev $tmp_mnt/lib
+ln -s -f ../usr/lib/udev $tmp_mnt/lib/udev
+else
+mkdir -p $tmp_mnt/lib/udev
+fi
+for script in /usr/lib/udev/* /lib/udev/* /sbin/*_id ; do
+if [ ! -d $script ]  [ -x $script ] ; then
+cp_bin $script ${tmp_mnt}${script}
+elif [ -f $script ] ; then
+cp -pL $script ${tmp_mnt}${script}
+fi
+done
+
 mkdir -p $tmp_mnt/lib/udev/rules.d
 mkdir -p $tmp_mnt/etc/udev/rules.d
 # copy needed rules
@@ -22,21 +37,14 @@ for rule in \
 64-md-raid.rules \
 79-kms.rules \
 80-drivers.rules; do
-if [ -f /lib/udev/rules.d/$rule ]; then
+if [ -f /usr/lib/udev/rules.d/$rule ]; then
+cp /usr/lib/udev/rules.d/$rule $tmp_mnt/usr/lib/udev/rules.d
+elif [ 

commit mkinitrd for openSUSE:Factory

2012-08-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-08-04 09:22:26

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-07-30 
09:26:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-08-04 
09:22:28.0 +0200
@@ -1,0 +2,11 @@
+Mon Jul 30 23:12:39 UTC 2012 - je...@suse.com
+
+- Version 2.7.1.
+
+---
+Mon Jul 30 21:48:12 UTC 2012 - je...@suse.com
+
+- Added hid-generic to boot-usb.sh so keyboards are usable in initrd
+  (bnc#773559).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.mFOnfS/_old  2012-08-04 09:22:31.0 +0200
+++ /var/tmp/diff_new_pack.mFOnfS/_new  2012-08-04 09:22:31.0 +0200
@@ -41,7 +41,7 @@
 %else
 Requires:   sysvinit
 %endif
-Version:2.7.0
+Version:2.7.1
 Release:0
 Conflicts:  udev  118
 Requires:   dhcpcd

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.1/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-07-26 09:48:26.0 +0200
+++ new/mkinitrd-2.7.1/mkinitrd.changes 2012-07-31 01:12:51.0 +0200
@@ -1,4 +1,15 @@
 ---
+Mon Jul 30 23:12:39 UTC 2012 - je...@suse.com
+
+- Version 2.7.1.
+
+---
+Mon Jul 30 21:48:12 UTC 2012 - je...@suse.com
+
+- Added hid-generic to boot-usb.sh so keyboards are usable in initrd
+  (bnc#773559).
+
+---
 Thu Jul 26 07:47:57 UTC 2012 - mma...@suse.cz
 
 - Add purge-kernels.service to the filelist.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/mkinitrd 
new/mkinitrd-2.7.1/sbin/mkinitrd
--- old/mkinitrd-2.7.0/sbin/mkinitrd2012-07-26 09:48:26.0 +0200
+++ new/mkinitrd-2.7.1/sbin/mkinitrd2012-07-31 01:12:51.0 +0200
@@ -25,7 +25,7 @@
 # git://git.opensuse.org/projects/mkinitrd.git
 #
 
-VERSION=2.7.0
+VERSION=2.7.1
 LOGDIR=/var/log/YaST2
 LOGFILE=$LOGDIR/mkinitrd.log
 declare -a cmd_option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-usb.sh 
new/mkinitrd-2.7.1/scripts/boot-usb.sh
--- old/mkinitrd-2.7.0/scripts/boot-usb.sh  2012-07-26 09:48:26.0 
+0200
+++ new/mkinitrd-2.7.1/scripts/boot-usb.sh  2012-07-31 01:12:51.0 
+0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #%stage: device
-#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj
+#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid 
hid-logitech-dj hid-generic
 #%if: $use_usb
 #
 # usb module helper

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-07-30 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-07-30 09:26:08

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-07-19 
17:58:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-07-30 
09:26:10.0 +0200
@@ -1,0 +2,22 @@
+Thu Jul 26 07:47:57 UTC 2012 - mma...@suse.cz
+
+- Add purge-kernels.service to the filelist.
+
+---
+Wed Jul 25 20:08:03 UTC 2012 - mvysko...@suse.cz
+
+- Add purge-kernels.service
+
+---
+Thu Jul 19 11:58:40 UTC 2012 - mma...@suse.cz
+
+- Do not copy firmware files of all kernel packages installed
+  (bnc#769627).
+
+---
+Thu Jul 19 09:08:26 UTC 2012 - dmzh...@suse.com
+
+- boot-devfunctions.sh: Call vgchange with --partial --sysinit
+  (bnc#731317).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.SdNe5P/_old  2012-07-30 09:26:12.0 +0200
+++ /var/tmp/diff_new_pack.SdNe5P/_new  2012-07-30 09:26:12.0 +0200
@@ -20,6 +20,10 @@
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
 BuildRequires:  asciidoc
 BuildRequires:  libxslt
+%if 0%{?suse_version} = 1210
+BuildRequires:  systemd
+%{?systemd_requires}
+%endif
 Requires:   coreutils
 Requires:   cpio
 Requires:   file
@@ -124,13 +128,34 @@
 install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels
 install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
+%if 0%{?suse_version} = 1210
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
+install -m 644 etc/purge-kernels.service $RPM_BUILD_ROOT/%{_unitdir}/
+%endif
+
+%pre
+%if 0%{?suse_version} = 1210
+%service_add_pre purge-kernels.service
+%endif
+
+%preun
+%if 0%{?suse_version} = 1210
+%service_del_preun purge-kernels.service
+%endif
+
 %post
 %{fillup_only -an kernel}
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
 %{fillup_and_insserv -f -Y purge-kernels}
+%if 0%{?suse_version} = 1210
+%service_add_post purge-kernels.service
+%endif
 
 %postun
 %insserv_cleanup
+%if 0%{?suse_version} = 1210
+%service_del_postun purge-kernels.service
+%endif
 
 %posttrans
 /sbin/mkinitrd_setup
@@ -149,6 +174,7 @@
 %config /etc/rpm/macros.mkinitrd
 /etc/init.d/boot.loadmodules
 /etc/init.d/purge-kernels
+%_unitdir/purge-kernels.service
 /lib/mkinitrd/scripts/*.sh
 /lib/mkinitrd/bin/*
 /bin/lsinitrd

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/etc/purge-kernels.service 
new/mkinitrd-2.7.0/etc/purge-kernels.service
--- old/mkinitrd-2.7.0/etc/purge-kernels.service1970-01-01 
01:00:00.0 +0100
+++ new/mkinitrd-2.7.0/etc/purge-kernels.service2012-07-26 
09:48:26.0 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=Purge old kernels
+After=local_fs.target
+ConditionPathExists=/boot/do_pure_kernels
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/rm -f /boot/do_pure_kernels
+ExecStart=/sbin/purge-kernels
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-07-18 16:26:28.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-07-26 09:48:26.0 +0200
@@ -1,4 +1,26 @@
 ---
+Thu Jul 26 07:47:57 UTC 2012 - mma...@suse.cz
+
+- Add purge-kernels.service to the filelist.
+
+---
+Wed Jul 25 20:08:03 UTC 2012 - mvysko...@suse.cz
+
+- Add purge-kernels.service
+
+---
+Thu Jul 19 11:58:40 UTC 2012 - mma...@suse.cz
+
+- Do not copy firmware files of all kernel packages installed
+  (bnc#769627).
+
+---
+Thu Jul 19 09:08:26 UTC 2012 - dmzh...@suse.com
+
+- boot-devfunctions.sh: Call vgchange with --partial --sysinit
+  (bnc#731317).
+
+---
 Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz
 
 - Add xhci-hcd to the initrd (bnc#755113).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' 

commit mkinitrd for openSUSE:Factory

2012-07-19 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-07-19 17:58:16

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-07-04 
22:21:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-07-19 
17:58:35.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz
+
+- Add xhci-hcd to the initrd (bnc#755113).
+
+---
@@ -22,0 +28,11 @@
+
+---
+Fri May 11 11:04:06 UTC 2012 - mma...@suse.cz
+
+- setup-network.sh: Fix handling of bridge interfaces (bnc#759623)
+
+---
+Fri May  4 13:57:48 UTC 2012 - mma...@suse.cz
+
+- Recreate the initrd for all installed kernels after updating
+  the mkinitrd package (bnc#755924).

Old:

  mkinitrd-2.7.0-adjtime.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.p8bnU3/_old  2012-07-19 17:58:40.0 +0200
+++ /var/tmp/diff_new_pack.p8bnU3/_new  2012-07-19 17:58:40.0 +0200
@@ -47,7 +47,6 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
-Patch0: mkinitrd-2.7.0-adjtime.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -82,7 +81,6 @@
 
 %prep
 %setup
-%patch0 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
@@ -136,6 +134,7 @@
 
 %posttrans
 /sbin/mkinitrd_setup
+/sbin/mkinitrd
 
 %files
 %defattr(-,root,root)

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-06-13 15:58:10.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-07-18 16:26:28.0 +0200
@@ -1,4 +1,16 @@
 ---
+Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz
+
+- Add xhci-hcd to the initrd (bnc#755113).
+
+---
+Wed Jul  4 14:43:05 UTC 2012 - wer...@suse.de
+
+- Fix boot clock scriptlet by testing /etc/adjtime before
+  /etc/sysconfig/clock to make sure that warpclock is executed
+  if CMOS clock is in local time
+
+---
 Tue Jun 12 15:28:45 UTC 2012 - co...@suse.com
 
 - mount /usr without chrooting into root fs first, /usr carries
@@ -15,6 +27,17 @@
 - Make warpclock working with upstream systemd HW clock management
 
 ---
+Fri May 11 11:04:06 UTC 2012 - mma...@suse.cz
+
+- setup-network.sh: Fix handling of bridge interfaces (bnc#759623)
+
+---
+Fri May  4 13:57:48 UTC 2012 - mma...@suse.cz
+
+- Recreate the initrd for all installed kernels after updating
+  the mkinitrd package (bnc#755924).
+
+---
 Thu May  3 11:59:35 UTC 2012 - mma...@suse.cz
 
 - Avoid accidental tilde expansion when parsing parameters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec 
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2012-06-13 15:58:10.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.spec2012-07-18 16:26:28.0 +0200
@@ -126,6 +126,7 @@
 
 %posttrans
 /sbin/mkinitrd_setup
+/sbin/mkinitrd
 
 %files
 %defattr(-,root,root)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-clock.sh 
new/mkinitrd-2.7.0/scripts/boot-clock.sh
--- old/mkinitrd-2.7.0/scripts/boot-clock.sh2012-06-13 15:58:10.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-clock.sh2012-07-18 16:26:28.0 
+0200
@@ -5,21 +5,23 @@
 #%provides: clock
 #%dontshow
 
-if test -e /etc/sysconfig/clock -a -e /etc/localtime
+if test -e /etc/localtime
 then
-. /etc/sysconfig/clock
-case $HWCLOCK in
-*-l*) /bin/warpclock
-  /dev/shm/warpclock
-esac
-elif test -e /etc/adjtime -a -e /etc/localtime
-then
-while read line
-do
-  

commit mkinitrd for openSUSE:Factory

2012-07-04 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-07-04 22:21:12

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-06-15 
14:03:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-07-04 
22:21:13.0 +0200
@@ -1,0 +2,7 @@
+Wed Jul  4 14:43:05 UTC 2012 - wer...@suse.de
+
+- Fix boot clock scriptlet by testing /etc/adjtime before
+  /etc/sysconfig/clock to make sure that warpclock is executed
+  if CMOS clock is in local time 
+
+---

New:

  mkinitrd-2.7.0-adjtime.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.Ecvthr/_old  2012-07-04 22:21:15.0 +0200
+++ /var/tmp/diff_new_pack.Ecvthr/_new  2012-07-04 22:21:15.0 +0200
@@ -47,6 +47,7 @@
 Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
+Patch0: mkinitrd-2.7.0-adjtime.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -81,6 +82,7 @@
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-2.7.0-adjtime.patch ++
From 5976679fa6f496e2904a6c33c9340fabd061f2d7 Mon Sep 17 00:00:00 2001
From: Werner Fink wer...@suse.de
Date: Wed, 4 Jul 2012 16:53:10 +0200
Subject: [PATCH] Fix boot clock scriptlet to read /etc/adjtime

Fix boot clock scriptlet by testing /etc/adjtime before
/etc/sysconfig/clock to make sure that warpclock is
executed if CMOS clock is in local time

Signed-off-by: Werner Fink wer...@suse.de
---
 scripts/boot-clock.sh |   34 ++
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/scripts/boot-clock.sh b/scripts/boot-clock.sh
index 6a9e2dc..990391d 100644
--- a/scripts/boot-clock.sh
+++ b/scripts/boot-clock.sh
@@ -5,21 +5,23 @@
 #%provides: clock
 #%dontshow
 
-if test -e /etc/sysconfig/clock -a -e /etc/localtime
+if test -e /etc/localtime
 then
-. /etc/sysconfig/clock
-case $HWCLOCK in
-*-l*) /bin/warpclock
-  /dev/shm/warpclock
-esac
-elif test -e /etc/adjtime -a -e /etc/localtime
-then
-while read line
-do
-   if test $line = LOCAL
-   then
-   /bin/warpclock
-/dev/shm/warpclock
-   fi
-done  /etc/adjtime
+if test -e /etc/adjtime
+then
+   while read line
+   do  if test $line = LOCAL
+   then
+   /bin/warpclock
+/dev/shm/warpclock
+   fi
+   done  /etc/adjtime
+elif test -e /etc/sysconfig/clock
+then
+   . /etc/sysconfig/clock
+   case $HWCLOCK in
+   *-l*) /bin/warpclock
+   /dev/shm/warpclock
+   esac
+fi
 fi
-- 
1.7.9.2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-06-15 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-06-15 14:03:32

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-05-31 
17:07:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-06-15 
14:03:34.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 12 15:28:45 UTC 2012 - co...@suse.com
+
+- mount /usr without chrooting into root fs first, /usr carries
+  important binaries by now (bnc#752796)
+
+---
@@ -11,0 +18,6 @@
+Thu May  3 11:59:35 UTC 2012 - mma...@suse.cz
+
+- Avoid accidental tilde expansion when parsing parameters
+  (bnc#760364).
+
+---
@@ -38 +50 @@
-- boot-udev: add blkid dependency (bnc#751140, bnc#754049, and others).
+- boot-udev: add blkid dependency

Old:

  mkinitrd-add-logitech-unity
  mkinitrd-firmware-in-usr
  mkinitrd_cp_umount_mount_dmesg_in_usr.patch
  mkinitrd_cpbin_follow_link.patch
  mkinitrd_simplify_netsetup.patch
  mkinitrd_systemd_adjtime.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.lYCODC/_old  2012-06-15 14:03:36.0 +0200
+++ /var/tmp/diff_new_pack.lYCODC/_new  2012-06-15 14:03:36.0 +0200
@@ -51,12 +51,6 @@
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
 # silently overwritten by the next submission.
-Patch0: mkinitrd_cpbin_follow_link.patch
-Patch1: mkinitrd_simplify_netsetup.patch
-Patch2: mkinitrd-firmware-in-usr
-Patch3: mkinitrd_cp_umount_mount_dmesg_in_usr.patch
-Patch4: mkinitrd-add-logitech-unity
-Patch5: mkinitrd_systemd_adjtime.patch
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -87,12 +81,6 @@
 
 %prep
 %setup
-%patch0
-%patch1
-%patch2 -p1
-%patch3
-%patch4 -p1
-%patch5
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-03-22 11:30:37.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-06-13 15:58:10.0 +0200
@@ -1,4 +1,50 @@
 ---
+Tue Jun 12 15:28:45 UTC 2012 - co...@suse.com
+
+- mount /usr without chrooting into root fs first, /usr carries
+  important binaries by now (bnc#752796)
+
+---
+Tue May 29 07:38:50 UTC 2012 - wer...@suse.de
+
+- Fix clock scriptlet by adding `then'
+
+---
+Wed May 23 12:48:47 UTC 2012 - wer...@suse.de
+
+- Make warpclock working with upstream systemd HW clock management
+
+---
+Thu May  3 11:59:35 UTC 2012 - mma...@suse.cz
+
+- Avoid accidental tilde expansion when parsing parameters
+  (bnc#760364).
+
+---
+Mon Apr 30 19:39:01 UTC 2012 - je...@suse.com
+
+- Add Logitech Unifying devices to initrd (bnc#741451).
+
+---
+Mon Apr 30 13:06:38 UTC 2012 - rschweik...@suse.com
+
+- support cp, mount, umount, and dmesg in usr tree
+
+---
+Tue Apr 17 22:58:25 UTC 2012 - je...@suse.com
+
+- Change firmware search path to /usr/lib/firmware -- udev as of 182
+  doesn't look in /lib/firmware (bnc#757655).
+
+---
+Wed Mar 28 20:35:35 UTC 2012 - rschweik...@suse.com
+
+- add patches mkinitrd_cpbin_follow_link.patch and
+  mkinitrd_simplify_netsetup.patch; pull requests 6  7 in gitorious
+  - setup-prepare: cp_bin() needs to follow links
+  - setup-network: move loop independent operation outside the loop
+
+---
 Thu Mar 22 10:29:58 UTC 2012 - seife+...@b1-systems.com
 
 - boot-udev: add blkid dependency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/mkinitrd 
new/mkinitrd-2.7.0/sbin/mkinitrd
--- old/mkinitrd-2.7.0/sbin/mkinitrd2012-03-22 11:30:37.0 

commit mkinitrd for openSUSE:Factory

2012-05-31 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-05-31 17:07:14

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-05-08 
06:46:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-05-31 
17:07:26.0 +0200
@@ -1,0 +2,10 @@
+Tue May 29 07:38:50 UTC 2012 - wer...@suse.de
+
+- Fix clock scriptlet by adding `then' 
+
+---
+Wed May 23 12:48:47 UTC 2012 - wer...@suse.de
+
+- Make warpclock working with upstream systemd HW clock management
+
+---

New:

  mkinitrd_systemd_adjtime.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.K1VHdT/_old  2012-05-31 17:07:28.0 +0200
+++ /var/tmp/diff_new_pack.K1VHdT/_new  2012-05-31 17:07:28.0 +0200
@@ -56,6 +56,7 @@
 Patch2: mkinitrd-firmware-in-usr
 Patch3: mkinitrd_cp_umount_mount_dmesg_in_usr.patch
 Patch4: mkinitrd-add-logitech-unity
+Patch5: mkinitrd_systemd_adjtime.patch
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -91,6 +92,7 @@
 %patch2 -p1
 %patch3
 %patch4 -p1
+%patch5
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd_systemd_adjtime.patch ++
--- scripts/boot-clock.sh
+++ scripts/boot-clock.sh   2012-05-29 07:33:46.222065636 +
@@ -12,4 +12,14 @@ then
 *-l*) /bin/warpclock
   /dev/shm/warpclock
 esac
+elif test -e /etc/adjtime -a -e /etc/localtime
+then
+while read line
+do
+   if test $line = LOCAL
+   then
+   /bin/warpclock
+/dev/shm/warpclock
+   fi
+done  /etc/adjtime
 fi
--- scripts/setup-clock.sh
+++ scripts/setup-clock.sh  2012-05-29 07:36:08.966565401 +
@@ -15,6 +15,14 @@ fi
 if test -e /etc/sysconfig/clock
 then
 . /etc/sysconfig/clock
-mkdir -m 0755 -p $tmp_mnt/etc/sysconfig
-echo HWCLOCK=''$HWCLOCK''  $tmp_mnt/etc/sysconfig/clock
+if test -n $HWCLOCK
+then
+   mkdir -m 0755 -p $tmp_mnt/etc/sysconfig
+   echo HWCLOCK=''$HWCLOCK''  $tmp_mnt/etc/sysconfig/clock
+fi
+fi
+if test -e /etc/adjtime
+then
+mkdir -m 0755 -p $tmp_mnt/etc
+cp -p /etc/adjtime $tmp_mnt/etc/
 fi
--- src/warpclock.c
+++ src/warpclock.c 2012-05-24 10:44:18.0 +
@@ -82,7 +82,7 @@ int main()
 time_t now, delta, gmtoff;
 struct stat st;
 int universal = 1;
-int count;
+int count, adj;
 
 err = warpclock: /etc/localtime;
 if (stat(/etc/localtime, st)  0)
@@ -92,9 +92,16 @@ int main()
 
 memset(zone, 0, sizeof(struct timezone));
 
-err = warpclock: /etc/sysconfig/clock;
-if ((conf = fopen(/etc/sysconfig/clock, r)) == (FILE *)0)
-   goto err;
+adj = 1;
+err = warpclock: /etc/adjtime;
+if ((conf = fopen(/etc/adjtime, r)) == (FILE *)0) {
+   if (errno != ENOENT)
+   goto err;
+   adj = 0;
+   err = warpclock: /etc/sysconfig/clock;
+   if ((conf = fopen(/etc/sysconfig/clock, r)) == (FILE *)0)
+   goto err;
+}
 while ((fgets(buffer[0], sizeof(buffer), conf))) {
const char * ptr = buffer[0];
while (isblank(*ptr))
@@ -103,7 +110,15 @@ int main()
continue;
if (*ptr == '\n')
continue;
-   if (strncmp(HWCLOCK=, ptr, 8) == 0) {
+   if (adj) {
+   char *end;
+   if ((end = strrchr(ptr, '\n')))
+   *end = '\0';
+   if (strcmp(UTC, ptr) == 0) {
+   universal = 1;
+   break;
+   }
+   } else if (strncmp(HWCLOCK=, ptr, 8) == 0) {
universal = !strstr(ptr, -l);
break;
}
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-05-07 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-05-08 06:46:39

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-04-20 
15:18:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-05-08 
06:46:58.0 +0200
@@ -1,0 +2,10 @@
+Mon Apr 30 19:39:01 UTC 2012 - je...@suse.com
+
+- Add Logitech Unifying devices to initrd (bnc#741451).
+
+---
+Mon Apr 30 13:06:38 UTC 2012 - rschweik...@suse.com
+
+- support cp, mount, umount, and dmesg in usr tree
+
+---

New:

  mkinitrd-add-logitech-unity
  mkinitrd_cp_umount_mount_dmesg_in_usr.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.Kjn0uA/_old  2012-05-08 06:46:59.0 +0200
+++ /var/tmp/diff_new_pack.Kjn0uA/_new  2012-05-08 06:46:59.0 +0200
@@ -54,6 +54,8 @@
 Patch0: mkinitrd_cpbin_follow_link.patch
 Patch1: mkinitrd_simplify_netsetup.patch
 Patch2: mkinitrd-firmware-in-usr
+Patch3: mkinitrd_cp_umount_mount_dmesg_in_usr.patch
+Patch4: mkinitrd-add-logitech-unity
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -87,6 +89,8 @@
 %patch0
 %patch1
 %patch2 -p1
+%patch3
+%patch4 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-add-logitech-unity ++
From: Jeff Mahoney je...@suse.com
Subject: mkinitrd: add Logitech Unifying devices to initrd
Patch-mainline: Pull request sent 30 Apr 2012
References: bnc#741451

 Linux commit 534a7b8e (HID: Add full support for Logitech Unifying receivers)
 split support for Logitech Unifying devices out from the regular usbhid
 module. This caused working systems with device devices to fail to have
 keyboard support to do things like enter a decryption password.

 This patch adds the hid-logitech-dj driver to the initrd so those devices
 will work as expected.

Signed-off-by: Jeff Mahoney je...@suse.com
---
 scripts/boot-usb.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/scripts/boot-usb.sh
+++ b/scripts/boot-usb.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #%stage: device
-#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd usbhid
+#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd usbhid hid-logitech-dj
 #%if: $use_usb
 #
 # usb module helper
++ mkinitrd-firmware-in-usr ++
--- /var/tmp/diff_new_pack.Kjn0uA/_old  2012-05-08 06:47:00.0 +0200
+++ /var/tmp/diff_new_pack.Kjn0uA/_new  2012-05-08 06:47:00.0 +0200
@@ -1,5 +1,6 @@
 From: Jeff Mahoney je...@suse.com
 Subject: mkinitrd: Firmware in /usr/lib/firmware
+Patch-mainline: Pull request sent 30 Apr 2012
 References: bnc#757655
 
  With udev 182, firmware is expected to be in /usr/lib/firmware.

++ mkinitrd_cp_umount_mount_dmesg_in_usr.patch ++
--- scripts/boot-start.sh.orig
+++ scripts/boot-start.sh
@@ -2,7 +2,7 @@
 #
 #%stage: boot
 #%depends: devfunctions
-#%programs: /bin/bash umount mount /bin/mknod /bin/mkdir /bin/ln /bin/date 
/bin/sleep /bin/cat /bin/sed /sbin/insmod /sbin/modprobe /bin/kill 
/sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof /bin/mv 
/bin/chmod /bin/rm /bin/true /bin/ls /lib/mkinitrd/bin/* dmesg
+#%programs: /bin/bash /bin/umount /bin/mount /bin/mknod /bin/mkdir /bin/ln 
/bin/date /bin/sleep /bin/cat /bin/sed /sbin/insmod /sbin/modprobe /bin/kill 
/sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole /bin/cp /sbin/pidof 
/bin/mv /bin/chmod /bin/rm /bin/true /bin/ls /lib/mkinitrd/bin/* /bin/dmesg
 #%modules: $RESOLVED_INITRD_MODULES
 #%udevmodules: $RESOLVED_INITRD_MODULES_UDEV
 #%dontshow
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-04-20 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-04-20 15:18:28

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-03-30 
14:19:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-04-20 
15:18:37.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 17 22:58:25 UTC 2012 - je...@suse.com
+
+- Change firmware search path to /usr/lib/firmware -- udev as of 182
+  doesn't look in /lib/firmware (bnc#757655).
+
+---

New:

  mkinitrd-firmware-in-usr



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.notIw8/_old  2012-04-20 15:18:38.0 +0200
+++ /var/tmp/diff_new_pack.notIw8/_new  2012-04-20 15:18:38.0 +0200
@@ -53,6 +53,7 @@
 # silently overwritten by the next submission.
 Patch0: mkinitrd_cpbin_follow_link.patch
 Patch1: mkinitrd_simplify_netsetup.patch
+Patch2: mkinitrd-firmware-in-usr
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -85,6 +86,7 @@
 %setup
 %patch0
 %patch1
+%patch2 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd-firmware-in-usr ++
From: Jeff Mahoney je...@suse.com
Subject: mkinitrd: Firmware in /usr/lib/firmware
References: bnc#757655

 With udev 182, firmware is expected to be in /usr/lib/firmware.

 This patch adds the ability for it to look in /usr/lib/firmware, with
 /lib/firmware as a fallback.

 We use /path/to/firmware/ (trailing slash) so we follow the top
 link with the name we used instead of the link target.

Signed-off-by: Jeff Mahoney je...@suse.com
---
 scripts/setup-modules.sh |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/scripts/setup-modules.sh
+++ b/scripts/setup-modules.sh
@@ -332,7 +332,12 @@ for module in $resolved_modules; do
 for fwl in $(modinfo -F firmware $module) ; do
bmod=$(basename $module)
bfwl=$(basename $fwl)
-   for fw in $(find /lib/firmware -name $bfwl) ; do
+
+   # Using find -L instead of a trailing slash means
+   # we get /lib/firmware instead of /usr/lib/firmware.
+   firmwaredir=/usr/lib/firmware/
+   [ -e $firmwaredir ] || firmwaredir=/lib/firmware/
+   for fw in $(find $firmwaredir -name $bfwl) ; do
cp -p --parents $fw $tmp_mnt
echo -n (module $bmod firmware $fw) 
done
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-03-30 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-03-30 14:19:42

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-03-29 
07:45:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-03-30 
14:19:44.0 +0200
@@ -1,0 +2,8 @@
+Wed Mar 28 20:35:35 UTC 2012 - rschweik...@suse.com
+
+- add patches mkinitrd_cpbin_follow_link.patch and
+  mkinitrd_simplify_netsetup.patch; pull requests 6  7 in gitorious
+  - setup-prepare: cp_bin() needs to follow links
+  - setup-network: move loop independent operation outside the loop
+
+---

New:

  mkinitrd_cpbin_follow_link.patch
  mkinitrd_simplify_netsetup.patch



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.pNi40j/_old  2012-03-30 14:19:47.0 +0200
+++ /var/tmp/diff_new_pack.pNi40j/_new  2012-03-30 14:19:47.0 +0200
@@ -51,6 +51,8 @@
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
 # silently overwritten by the next submission.
+Patch0: mkinitrd_cpbin_follow_link.patch
+Patch1: mkinitrd_simplify_netsetup.patch
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -81,6 +83,8 @@
 
 %prep
 %setup
+%patch0
+%patch1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++ mkinitrd_cpbin_follow_link.patch ++
--- scripts/setup-prepare.sh.orig
+++ scripts/setup-prepare.sh
@@ -23,23 +23,57 @@
 ##
 
 # Install a binary file
+cp_link() {
+# Copy the target of the given link $1 to the destination $2
+# spaces and special characters in file names will break things
+if [ -h $1 ]; then
+lnkTarget=$(readlink $1)
+if [ -e $lnkTarget ];then
+cp -a $lnkTarget $2/$lnkTarget
+else
+# This link points to something in the same directory
+lnkSrc=$1
+# Get the base bath of the link origin
+lnkSrcBase=${lnkSrc%/*}
+cp -a $lnkSrcBase/$lnkTarget $2/$lnkSrcBase/$lnkTarget
+fi
+return 1
+fi
+return 0
+}
+
 cp_bin() {
 cp -a $@ \
 || exit_code=1
 
-# Remember the binaries installed. We need the list for checking
-# for dynamic libraries.
-while [ $# -gt 1 ]; do
-initrd_bins[${#initrd_bins[@]}]=$1
-shift
-   done
-   # file may print '^setuid ELF ...'
-   # suid mount will fail if mkinitrd was called as user
-   if [ -L $1 ]; then
-: do nothing with symlinks
-   elif [ -d $1 -o -f $1 ]; then
- find $1 -type f -print0 | xargs -0 chmod 0755
-   fi
+if [ -h $1 ]; then
+lnkTarget=$1
+# Determine the base bath of the target
+targetPath=$2
+targetBase=${targetPath%$1*}
+while [ 1 ]; do
+cp_link $lnkTarget $targetBase
+lnkCopied=$?
+if [ $lnkCopied = 0 ]; then
+if [ -e $lnkTarget ]; then
+initrd_bins[${#initrd_bins[@]}]=$lnkTarget
+fi
+break
+fi
+done
+else
+# Remember the binaries installed. We need the list for checking
+# for dynamic libraries.
+while [ $# -gt 1 ]; do
+initrd_bins[${#initrd_bins[@]}]=$1
+shift
+done
+# file may print '^setuid ELF ...'
+# suid mount will fail if mkinitrd was called as user
+if [ -d $1 -o -f $1 ]; then
+find $1 -type f -print0 | xargs -0 chmod 0755
+fi
+fi
 }
 
 # check if we should use script or feature $1
++ mkinitrd_simplify_netsetup.patch ++
--- scripts/setup-network.sh.orig
+++ scripts/setup-network.sh
@@ -306,18 +306,14 @@ for f in /{lib,etc}/udev/rules.d/77-netw
 continue
 fi
 cp --parents $f $tmp_mnt/
-cp_bin /sbin/ifup $tmp_mnt/sbin/ifup
-mkdir -p $tmp_mnt/etc/alternatives
-for bin in /bin/{g,}awk /etc/alternatives/awk; do
-if test -e $bin; then
-cp_bin $bin $tmp_mnt/$bin
-fi
-done
-cp_bin /bin/grep $tmp_mnt/bin/grep
-cp_bin /bin/logger $tmp_mnt/bin/logger
-cp_bin /bin/touch $tmp_mnt/bin/touch
-break
 done
+# awk points to alternatives, need the directory
+mkdir -p $tmp_mnt/etc/alternatives
+cp_bin /bin/awk $tmp_mnt/bin/awk
+cp_bin /bin/grep $tmp_mnt/bin/grep
+cp_bin /sbin/ifup $tmp_mnt/sbin/ifup
+cp_bin /bin/logger 

commit mkinitrd for openSUSE:Factory

2012-03-28 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-03-29 07:45:36

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-03-23 
12:09:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-03-29 
07:45:38.0 +0200
@@ -4 +4 @@
-- boot-udev: add blkid dependency
+- boot-udev: add blkid dependency (bnc#751140, bnc#754049, and others).



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.9bgbd9/_old  2012-03-29 07:45:39.0 +0200
+++ /var/tmp/diff_new_pack.9bgbd9/_new  2012-03-29 07:45:39.0 +0200
@@ -15,28 +15,36 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   mkinitrd
-License:GPL-2.0+
-Group:  System/Base
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
-BuildRequires:  asciidoc libxslt
-Requires:   coreutils modutils util-linux grep gzip sed cpio udev file 
perl-Bootloader
+BuildRequires:  asciidoc
+BuildRequires:  libxslt
+Requires:   coreutils
+Requires:   cpio
+Requires:   file
+Requires:   grep
+Requires:   gzip
+Requires:   modutils
+Requires:   perl-Bootloader
+Requires:   sed
+Requires:   udev
+Requires:   util-linux
 Requires:   xz
 %if 0%{?suse_version}  1120
-Requires:   sysvinit-tools sbin_init
+Requires:   sbin_init
+Requires:   sysvinit-tools
 %else
 Requires:   sysvinit
 %endif
-AutoReqProv:on
 Version:2.7.0
-Release:3
+Release:0
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq
 Summary:Creates an Initial RAM Disk Image for Preloading Modules
+License:GPL-2.0+
+Group:  System/Base
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
 # Note: the whole package is maintained in this git repository, please

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-03-23 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-03-23 12:09:12

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-03-22 
12:36:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-03-23 
12:09:14.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 22 10:29:58 UTC 2012 - seife+...@b1-systems.com
+
+- boot-udev: add blkid dependency
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-03-20 14:23:18.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-03-22 11:30:37.0 +0100
@@ -1,4 +1,9 @@
 ---
+Thu Mar 22 10:29:58 UTC 2012 - seife+...@b1-systems.com
+
+- boot-udev: add blkid dependency
+
+---
 Tue Mar 20 13:19:12 UTC 2012 - mma...@suse.cz
 
 - boot-udev: Trigger add action for subsystems (bnc#750668).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-udev.sh 
new/mkinitrd-2.7.0/scripts/boot-udev.sh
--- old/mkinitrd-2.7.0/scripts/boot-udev.sh 2012-03-20 14:23:18.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-udev.sh 2012-03-22 11:30:37.0 
+0100
@@ -1,7 +1,7 @@
 #!/bin/bash
 #%stage: boot
 #%depends: start dm
-#%programs: /sbin/udevd /sbin/udevadm /bin/uname
+#%programs: /sbin/udevd /sbin/udevadm /bin/uname /sbin/blkid
 #%dontshow
 #
 # udev initialization

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-03-22 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-03-22 12:35:39

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-03-20 
11:30:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-03-22 
12:36:27.0 +0100
@@ -1,0 +2,10 @@
+Tue Mar 20 13:19:12 UTC 2012 - mma...@suse.cz
+
+- boot-udev: Trigger add action for subsystems (bnc#750668).
+
+---
+Thu Mar 15 15:12:25 UTC 2012 - mma...@suse.cz
+
+- setup-network: Print warnings to stderr.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-03-14 14:50:06.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-03-20 14:23:18.0 +0100
@@ -1,4 +1,14 @@
 ---
+Tue Mar 20 13:19:12 UTC 2012 - mma...@suse.cz
+
+- boot-udev: Trigger add action for subsystems (bnc#750668).
+
+---
+Thu Mar 15 15:12:25 UTC 2012 - mma...@suse.cz
+
+- setup-network: Print warnings to stderr.
+
+---
 Wed Mar 14 13:32:58 UTC 2012 - ru...@raaftech.nl
 
 - Copy ifcfg settings regardless of nettype value (bnc#724775).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-udev.sh 
new/mkinitrd-2.7.0/scripts/boot-udev.sh
--- old/mkinitrd-2.7.0/scripts/boot-udev.sh 2012-03-14 14:50:06.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-udev.sh 2012-03-20 14:23:18.0 
+0100
@@ -28,4 +28,5 @@
 echo Creating device nodes with udev
 /sbin/udevd --daemon
 /sbin/udevadm trigger --action=add
+/sbin/udevadm trigger --type=subsystems --action=add
 wait_for_events
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2012-03-14 14:50:06.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2012-03-20 14:23:18.0 
+0100
@@ -127,9 +127,9 @@
 done
 
 if [ $count -ne 1 ] ; then
-echo WARNING: $port is a bridge with more than one interfaces
-echo  behind the bridge. Please call mkinitrd with a
-echo  device name manually (-D or -I).
+echo 2 WARNING: $port is a bridge with more than one interfaces
+echo 2  behind the bridge. Please call mkinitrd with a
+echo 2  device name manually (-D or -I).
 else
 ifname=$ports
 fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-03-20 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-03-20 11:30:12

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-02-24 
06:53:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-03-20 
11:30:37.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 14 13:32:58 UTC 2012 - ru...@raaftech.nl
+
+- Copy ifcfg settings regardless of nettype value (bnc#724775).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-23 16:32:27.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-03-14 14:50:06.0 +0100
@@ -1,4 +1,9 @@
 ---
+Wed Mar 14 13:32:58 UTC 2012 - ru...@raaftech.nl
+
+- Copy ifcfg settings regardless of nettype value (bnc#724775).
+
+---
 Thu Feb 23 15:31:57 UTC 2012 - rjsch...@suse.com
 
 - support binaries in /usr tree.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2012-02-23 16:32:27.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2012-03-14 14:50:06.0 
+0100
@@ -266,9 +266,9 @@
 done
 
 # Copy ifcfg settings
+mkdir -p $tmp_mnt/etc/sysconfig
+cp -rp /etc/sysconfig/network $tmp_mnt/etc/sysconfig
 if [ $nettype = ifup ] ; then
-mkdir -p $tmp_mnt/etc/sysconfig
-cp -rp /etc/sysconfig/network $tmp_mnt/etc/sysconfig
 for i in /etc/sysconfig/network/ifcfg-*; do
interface=${i##*/ifcfg-}
if [ -d /sys/class/net/$interface/device ] ; then

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-02-23 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-02-24 06:53:09

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-02-17 
12:06:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-02-24 
06:53:10.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 23 15:31:57 UTC 2012 - rjsch...@suse.com
+
+- support binaries in /usr tree.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-15 15:59:39.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-23 16:32:27.0 +0100
@@ -1,4 +1,9 @@
 ---
+Thu Feb 23 15:31:57 UTC 2012 - rjsch...@suse.com
+
+- support binaries in /usr tree.
+
+---
 Wed Feb 15 14:58:47 UTC 2012 - mma...@suse.cz
 
 - Simplify calling of get_kernel_version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-start.sh 
new/mkinitrd-2.7.0/scripts/boot-start.sh
--- old/mkinitrd-2.7.0/scripts/boot-start.sh2012-02-15 15:59:39.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-start.sh2012-02-23 16:32:27.0 
+0100
@@ -2,7 +2,7 @@
 #
 #%stage: boot
 #%depends: devfunctions
-#%programs: /bin/bash umount mount mknod mkdir ln date sleep cat /bin/sed 
/sbin/insmod /sbin/modprobe kill /sbin/killall5 /sbin/halt /sbin/reboot 
/sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* dmesg
+#%programs: /bin/bash umount mount /bin/mknod /bin/mkdir /bin/ln /bin/date 
/bin/sleep /bin/cat /bin/sed /sbin/insmod /sbin/modprobe /bin/kill 
/sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof /bin/mv 
/bin/chmod /bin/rm /bin/true /bin/ls /lib/mkinitrd/bin/* dmesg
 #%modules: $RESOLVED_INITRD_MODULES
 #%udevmodules: $RESOLVED_INITRD_MODULES_UDEV
 #%dontshow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-prepare.sh 
new/mkinitrd-2.7.0/scripts/setup-prepare.sh
--- old/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-15 15:59:39.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-23 16:32:27.0 
+0100
@@ -153,7 +153,7 @@
 cp $INITRD_PATH/bin/linuxrc $linuxrc
 mkdir $tmp_mnt/boot
 
-mkdir -p $tmp_mnt/{sbin,bin,etc,dev,proc,sys,root,config}
+mkdir -p $tmp_mnt/{sbin,bin,etc,dev,proc,sys,root,config,usr/bin,usr/sbin}
 
 mkdir -p -m 4777 $tmp_mnt/tmp
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-02-17 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-02-17 12:06:13

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-02-14 
11:25:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-02-17 
12:06:15.0 +0100
@@ -1,0 +2,10 @@
+Wed Feb 15 14:58:47 UTC 2012 - mma...@suse.cz
+
+- Simplify calling of get_kernel_version.
+
+---
+Wed Feb 15 13:55:39 UTC 2012 - m...@suse.de
+
+- Add support for ARM uImages.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-09 12:19:05.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-15 15:59:39.0 +0100
@@ -1,4 +1,14 @@
 ---
+Wed Feb 15 14:58:47 UTC 2012 - mma...@suse.cz
+
+- Simplify calling of get_kernel_version.
+
+---
+Wed Feb 15 13:55:39 UTC 2012 - m...@suse.de
+
+- Add support for ARM uImages.
+
+---
 Thu Feb  9 10:57:19 UTC 2012 - lchiqui...@suse.com
 
 - Install /boot/vmlinux for self compiled kernels in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/mkinitrd 
new/mkinitrd-2.7.0/sbin/mkinitrd
--- old/mkinitrd-2.7.0/sbin/mkinitrd2012-02-09 12:19:05.0 +0100
+++ new/mkinitrd-2.7.0/sbin/mkinitrd2012-02-15 15:59:39.0 +0100
@@ -141,6 +141,15 @@
 exit
 }
 
+kernel_version_from_image() {
+local kernel_image=$1 kernel_image_gz=${1//uImage/vmlinux}.gz
+
+if /sbin/get_kernel_version $kernel_image 2/dev/null; then
+return
+fi
+/sbin/get_kernel_version $kernel_image_gz 2/dev/null
+}
+
 default_kernel_images() {
 local regex kernel_image kernel_version version_version initrd_image
 local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
@@ -155,6 +164,9 @@
 i386|x86_64)
 regex='vmlinuz'
 ;;
+arm*)
+regex='uImage'
+;;
 *)  regex='vmlinu.'
 ;;
 esac
@@ -176,8 +188,7 @@
 
 [ -L /boot/$kernel_image ]  continue
 [ ${kernel_image%%.gz} != $kernel_image ]  continue
-kernel_version=$(/sbin/get_kernel_version \
- /boot/$kernel_image 2 /dev/null)
+kernel_version=$(kernel_version_from_image /boot/$kernel_image)
 initrd_image=$(echo $kernel_image | sed -e s|${regex}|initrd|)
 if [ $kernel_image != $initrd_image -a \
  -n $kernel_version -a \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-done.sh 
new/mkinitrd-2.7.0/scripts/setup-done.sh
--- old/mkinitrd-2.7.0/scripts/setup-done.sh2012-02-09 12:19:05.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-done.sh2012-02-15 15:59:39.0 
+0100
@@ -17,6 +17,14 @@
 then
 oops 8 Failed to build initrd
 fi
+
+arch=$(uname -i)
+if [[ $arch =~ arm ]];then
+   mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 \
+   -n 'Initrd' -d  $tmp_initrd $tmp_initrd.uboot
+   rm -f $tmp_initrd
+   tmp_initrd=$tmp_initrd.uboot
+fi
 popd  /dev/null 21
 if ! cp -f $tmp_initrd $initrd_image ; then
 oops 8 Failed to install initrd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-prepare.sh 
new/mkinitrd-2.7.0/scripts/setup-prepare.sh
--- old/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-09 12:19:05.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-15 15:59:39.0 
+0100
@@ -113,7 +113,7 @@
 error 1 No kernel image $kernel_image found
 fi
 
-kernel_version=$(/sbin/get_kernel_version $kernel_image)
+kernel_version=$(kernel_version_from_image $kernel_image)
 modules_dir=$root_dir/lib/modules/$kernel_version
 
 #echo -e Kernel version:\t$kernel_version

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-02-14 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-02-14 11:25:09

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-02-03 
10:24:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-02-14 
11:25:10.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb  9 10:57:19 UTC 2012 - lchiqui...@suse.com
+
+- Install /boot/vmlinux for self compiled kernels in the
+  installkernel script (bnc#739822).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-01 17:18:20.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-09 12:19:05.0 +0100
@@ -1,4 +1,10 @@
 ---
+Thu Feb  9 10:57:19 UTC 2012 - lchiqui...@suse.com
+
+- Install /boot/vmlinux for self compiled kernels in the
+  installkernel script (bnc#739822).
+
+---
 Wed Feb  1 16:14:25 UTC 2012 - oher...@suse.de
 
 - Include PV drivers even if running on emulated hardware, to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/installkernel 
new/mkinitrd-2.7.0/sbin/installkernel
--- old/mkinitrd-2.7.0/sbin/installkernel   2012-02-01 17:18:20.0 
+0100
+++ new/mkinitrd-2.7.0/sbin/installkernel   2012-02-09 12:19:05.0 
+0100
@@ -68,6 +68,19 @@
 cp -fp $KERNTYPES $INSTALL_PATH/Kerntypes-$KERNEL_VERSION
 fi
 
+case $(uname -m) in
+i?86 | x86_64)
+KERNBIN=$(dirname $MAPFILE)/vmlinux
+if [ -e $KERNBIN ]; then
+if [ -f $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz ]; then
+mv $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz \
+$INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz.old;
+fi
+gzip -c $KERNBIN  $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz
+fi
+;;
+esac
+
 #
 # Generate initial ramdisk
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-02-03 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-02-03 10:24:31

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-01-25 
15:02:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-02-03 
10:24:34.0 +0100
@@ -1,0 +2,12 @@
+Wed Feb  1 16:14:25 UTC 2012 - oher...@suse.de
+
+- Include PV drivers even if running on emulated hardware, to
+  be able to boot when the virtualization setup changes (bnc#710035).
+
+---
+Wed Feb  1 10:50:46 UTC 2012 - mma...@suse.cz
+
+- Add support for xz compressed initrd and use it on PPC
+  (bnc#742328).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.geBgec/_old  2012-02-03 10:24:35.0 +0100
+++ /var/tmp/diff_new_pack.geBgec/_new  2012-02-03 10:24:35.0 +0100
@@ -24,6 +24,7 @@
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
 BuildRequires:  asciidoc libxslt
 Requires:   coreutils modutils util-linux grep gzip sed cpio udev file 
perl-Bootloader
+Requires:   xz
 %if 0%{?suse_version}  1120
 Requires:   sysvinit-tools sbin_init
 %else

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-01-23 13:57:12.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-01 17:18:20.0 +0100
@@ -1,4 +1,16 @@
 ---
+Wed Feb  1 16:14:25 UTC 2012 - oher...@suse.de
+
+- Include PV drivers even if running on emulated hardware, to
+  be able to boot when the virtualization setup changes (bnc#710035).
+
+---
+Wed Feb  1 10:50:46 UTC 2012 - mma...@suse.cz
+
+- Add support for xz compressed initrd and use it on PPC
+  (bnc#742328).
+
+---
 Fri Jan 20 16:18:20 UTC 2012 - mma...@suse.cz
 
 - Load all scsi_dh_* modules early during boot (bnc#727428).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec 
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2012-01-23 13:57:12.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.spec2012-02-01 17:18:20.0 +0100
@@ -24,6 +24,7 @@
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
 BuildRequires:  asciidoc libxslt
 Requires:   coreutils modutils util-linux grep gzip sed cpio udev file 
perl-Bootloader
+Requires:   xz
 %if 0%{?suse_version}  1120
 Requires:   sysvinit-tools sbin_init
 %else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/lsinitrd 
new/mkinitrd-2.7.0/sbin/lsinitrd
--- old/mkinitrd-2.7.0/sbin/lsinitrd2012-01-23 13:57:12.0 +0100
+++ new/mkinitrd-2.7.0/sbin/lsinitrd2012-02-01 17:18:20.0 +0100
@@ -54,6 +54,17 @@
 esac
 done
 
+use_gzip=true
+uncomp()
+{
+   if $use_gzip  gzip -cd $1 2/dev/null; then
+   return
+   fi
+   use_gzip=false
+   xz -cd $1
+}
+
+
 initrd=$1
 
 if [ -z $initrd ] ; then
@@ -70,11 +81,11 @@
 
 if [ $config -eq 1 ] ; then
 # yes, that's snow, but doesn't use any temporary files :)
-for configfile in $(zcat $initrd | cpio $args --quiet | grep '^config/') ; 
do
+for configfile in $(uncomp $initrd | cpio $args --quiet | grep '^config/') 
; do
 echo = $configfile 
-zcat $initrd | cpio --quiet -i --to-stdout $configfile
+uncomp $initrd | cpio --quiet -i --to-stdout $configfile
 echo
 done
 else
-zcat $initrd | cpio --quiet $args
+uncomp $initrd | cpio --quiet $args
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-fv_guest.sh 
new/mkinitrd-2.7.0/scripts/boot-fv_guest.sh
--- old/mkinitrd-2.7.0/scripts/boot-fv_guest.sh 1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-fv_guest.sh 2012-02-01 17:18:20.0 
+0100
@@ -0,0 +1,5 @@
+#!/bin/bash
+#%stage: boot
+#%modules: $fv_guest_modules
+#%if: -n $fv_guest_modules
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 

commit mkinitrd for openSUSE:Factory

2012-01-25 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-01-25 15:02:21

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-01-09 
16:21:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-01-25 
15:02:26.0 +0100
@@ -1,0 +2,5 @@
+Fri Jan 20 16:18:20 UTC 2012 - mma...@suse.cz
+
+- Load all scsi_dh_* modules early during boot (bnc#727428).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-01-06 13:54:20.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-01-23 13:57:12.0 +0100
@@ -1,4 +1,9 @@
 ---
+Fri Jan 20 16:18:20 UTC 2012 - mma...@suse.cz
+
+- Load all scsi_dh_* modules early during boot (bnc#727428).
+
+---
 Fri Jan  6 12:53:47 UTC 2012 - mma...@suse.cz
 
 - setup-network: Properly install awk.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-scsi_dh.sh 
new/mkinitrd-2.7.0/scripts/boot-scsi_dh.sh
--- old/mkinitrd-2.7.0/scripts/boot-scsi_dh.sh  1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-scsi_dh.sh  2012-01-23 13:57:12.0 
+0100
@@ -0,0 +1,6 @@
+#!/bin/bash
+#%stage: boot
+#%depends: start
+#%modules: $scsi_dh_modules
+#%dontshow
+#%if: -n $scsi_dh_modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-scsi_dh.sh 
new/mkinitrd-2.7.0/scripts/setup-scsi_dh.sh
--- old/mkinitrd-2.7.0/scripts/setup-scsi_dh.sh 1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-scsi_dh.sh 2012-01-23 13:57:12.0 
+0100
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+#%stage: device
+#
+# 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
+
+save_var scsi_dh_modules

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-01-09 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-01-09 16:21:44

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2012-01-05 
13:51:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-01-09 
16:21:45.0 +0100
@@ -1,0 +2,5 @@
+Fri Jan  6 12:53:47 UTC 2012 - mma...@suse.cz
+
+- setup-network: Properly install awk.
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-01-03 15:38:31.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-01-06 13:54:20.0 +0100
@@ -1,4 +1,9 @@
 ---
+Fri Jan  6 12:53:47 UTC 2012 - mma...@suse.cz
+
+- setup-network: Properly install awk.
+
+---
 Tue Jan  3 14:24:46 UTC 2012 - mma...@suse.cz
 
 - Fix ibft for virtio devices (bnc#735058).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2012-01-03 15:38:31.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2012-01-06 13:54:20.0 
+0100
@@ -307,7 +307,12 @@
 fi
 cp --parents $f $tmp_mnt/
 cp_bin /sbin/ifup $tmp_mnt/sbin/ifup
-cp_bin /bin/awk $tmp_mnt/bin/awk
+mkdir -p $tmp_mnt/etc/alternatives
+for bin in /bin/{g,}awk /etc/alternatives/awk; do
+if test -e $bin; then
+cp_bin $bin $tmp_mnt/$bin
+fi
+done
 cp_bin /bin/grep $tmp_mnt/bin/grep
 cp_bin /bin/logger $tmp_mnt/bin/logger
 cp_bin /bin/touch $tmp_mnt/bin/touch

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2012-01-05 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-01-05 13:51:32

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2011-12-12 
17:03:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-01-05 
13:51:34.0 +0100
@@ -1,0 +2,11 @@
+Tue Jan  3 14:24:46 UTC 2012 - mma...@suse.cz
+
+- Fix ibft for virtio devices (bnc#735058).
+
+---
+Tue Jan  3 14:20:54 UTC 2012 - mma...@suse.cz
+
+- boot-ibft: Do not hardcode eth* device names (bnc#728631,
+  bnc#735058#c1).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.qFxJaF/_old  2012-01-05 13:51:35.0 +0100
+++ /var/tmp/diff_new_pack.qFxJaF/_new  2012-01-05 13:51:35.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mkinitrd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-12-07 22:16:36.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-01-03 15:38:31.0 +0100
@@ -1,4 +1,21 @@
 ---
+Tue Jan  3 14:24:46 UTC 2012 - mma...@suse.cz
+
+- Fix ibft for virtio devices (bnc#735058).
+
+---
+Tue Jan  3 14:20:54 UTC 2012 - mma...@suse.cz
+
+- boot-ibft: Do not hardcode eth* device names (bnc#728631,
+  bnc#735058#c1).
+
+---
+Thu Dec  8 10:56:45 UTC 2011 - cfarr...@suse.com
+
+- license update: GPL-2.0+
+  Use SPDX format (http://www.spdx.org/licenses)
+
+---
 Wed Dec  7 21:14:12 UTC 2011 - mma...@suse.cz
 
 - setup-network: Remember the interface name as a fallback if the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec 
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2011-12-07 22:16:36.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.spec2012-01-03 15:38:31.0 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package mkinitrd (Version 2.5.10)
+# spec file for package mkinitrd
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:   mkinitrd
-License:GPLv2+
+License:GPL-2.0+
 Group:  System/Base
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
 BuildRequires:  asciidoc libxslt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-ibft.sh 
new/mkinitrd-2.7.0/scripts/boot-ibft.sh
--- old/mkinitrd-2.7.0/scripts/boot-ibft.sh 2011-12-07 22:16:36.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-ibft.sh 2012-01-03 15:38:31.0 
+0100
@@ -20,7 +20,21 @@
 }
 
 ibft_get_ethdev() {
-(cd $ibft_nic/device/net; ls -d eth* 2/dev/null)
+local iface
+
+if test -d $ibft_nic/device/net ; then
+   for iface in $ibft_nic/device/net/*/addr_len; do
+   break
+done
+else
+   for iface in $ibft_nic/device/*/*/addr_len; do
+break
+   done
+fi
+iface=${iface%/*}
+iface=${iface##*/}
+
+echo $iface
 }
 
 ibft_get_initiatorname() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-ibft.sh 
new/mkinitrd-2.7.0/scripts/setup-ibft.sh
--- old/mkinitrd-2.7.0/scripts/setup-ibft.sh2011-12-07 22:16:36.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-ibft.sh2012-01-03 15:38:31.0 
+0100
@@ -6,9 +6,15 @@
 ibft_set_iface() {
 local iface
 
-for iface in $ibft_nic/device/net/*/addr_len; do
+if test -d $ibft_nic/device/net ; then
+   for iface in $ibft_nic/device/net/*/addr_len; do
break
-done
+done
+else
+   for iface in $ibft_nic/device/*/*/addr_len; do
+break
+   done
+fi
  

commit mkinitrd for openSUSE:Factory

2011-12-12 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2011-12-12 16:57:51

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2011-11-23 
19:36:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2011-12-12 
17:03:11.0 +0100
@@ -1,0 +2,18 @@
+Thu Dec  8 10:56:45 UTC 2011 - cfarr...@suse.com
+
+- license update: GPL-2.0+
+  Use SPDX format (http://www.spdx.org/licenses)
+
+---
+Wed Dec  7 21:14:12 UTC 2011 - mma...@suse.cz
+
+- setup-network: Remember the interface name as a fallback if the
+  mac address does not match (bnc#733375).
+
+---
+Mon Nov 28 15:31:26 UTC 2011 - mma...@suse.cz
+
+- setup-ibft: Do not assume that interface names start with 'eth'
+  (bnc#728631).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-11-22 13:49:46.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-12-07 22:16:36.0 +0100
@@ -1,4 +1,16 @@
 ---
+Wed Dec  7 21:14:12 UTC 2011 - mma...@suse.cz
+
+- setup-network: Remember the interface name as a fallback if the
+  mac address does not match (bnc#733375).
+
+---
+Mon Nov 28 15:31:26 UTC 2011 - mma...@suse.cz
+
+- setup-ibft: Do not assume that interface names start with 'eth'
+  (bnc#728631).
+
+---
 Tue Nov 22 12:29:02 UTC 2011 - mma...@suse.cz
 
 - setup-modules: Allow aliases as dependencies in the SUSE INITRD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-network.sh 
new/mkinitrd-2.7.0/scripts/boot-network.sh
--- old/mkinitrd-2.7.0/scripts/boot-network.sh  2011-11-22 13:49:46.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-network.sh  2011-12-07 22:16:36.0 
+0100
@@ -118,9 +118,10 @@
 }
 
 
+# macaddr2if eth0:00:00:de:ad:be:ef
 macaddr2if()
 {
-local macaddress=$1 tmpmac dev
+local macaddress=${1#*:} fallback=${1%%:*} tmpmac dev
 
 for dev in /sys/class/net/* ; do
 # skip files that are no directories
@@ -134,6 +135,7 @@
 return
 fi
 done
+echo $fallback
 }
 
 i=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-ibft.sh 
new/mkinitrd-2.7.0/scripts/setup-ibft.sh
--- old/mkinitrd-2.7.0/scripts/setup-ibft.sh2011-11-22 13:49:46.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-ibft.sh2011-12-07 22:16:36.0 
+0100
@@ -4,9 +4,15 @@
 #%depends: network
 
 ibft_set_iface() {
-local if=$(cd $ibft_nic/device/net; ls -d eth* 2/dev/null)
-[ $if ]  {
-   interface=$if
+local iface
+
+for iface in $ibft_nic/device/net/*/addr_len; do
+   break
+done
+iface=${iface%/*}
+iface=${iface##*/}
+if test -n $iface; then
+   interface=$iface
drvlink=$(get_network_module $interface)
if [ ! $nettype -a -e $ibft_nic/dhcp ]; then
nettype=dhcp
@@ -15,7 +21,7 @@
else
nettype=static
fi
-}
+fi
 }
 
 ibft_nic=/sys/firmware/ibft/ethernet0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2011-11-22 13:49:46.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-12-07 22:16:36.0 
+0100
@@ -237,9 +237,9 @@
 drvlink=$drvlink $(get_network_module $iface)
 read macaddress  /sys/class/net/$iface/address
 if $static; then
-static_macaddresses=$static_macaddresses $macaddress
+static_macaddresses=$static_macaddresses $iface:$macaddress
 else
-dhcp_macaddresses=$dhcp_macaddresses $macaddress
+dhcp_macaddresses=$dhcp_macaddresses $iface:$macaddress
 fi
 elif [ -d /sys/class/net/$iface/bonding ] ; then
 verbose [NETWORK]\tConfigure bonding for $iface

-- 
To 

commit mkinitrd for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2011-12-06 18:29:16

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.xl7Af5/_old  2011-12-06 18:51:19.0 +0100
+++ /var/tmp/diff_new_pack.xl7Af5/_new  2011-12-06 18:51:19.0 +0100
@@ -19,7 +19,7 @@
 
 
 Name:   mkinitrd
-License:GPLv2+
+License:GPL-2.0+
 Group:  System/Base
 #!BuildIgnore:  module-init-tools e2fsprogs udev reiserfs fop
 BuildRequires:  asciidoc libxslt

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-11-23 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2011-11-23 19:36:55

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2011-11-14 
13:17:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2011-11-23 
19:36:57.0 +0100
@@ -1,0 +2,12 @@
+Tue Nov 22 12:29:02 UTC 2011 - mma...@suse.cz
+
+- setup-modules: Allow aliases as dependencies in the SUSE INITRD
+  REQUIRES syntax (bnc#730617).
+
+---
+Tue Nov 22 11:02:18 UTC 2011 - mma...@suse.cz
+
+- setup-modules: Fix adding more than one additional dependency to
+  modules (bnc#730617).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-11-09 23:19:02.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-11-22 13:49:46.0 +0100
@@ -1,4 +1,16 @@
 ---
+Tue Nov 22 12:29:02 UTC 2011 - mma...@suse.cz
+
+- setup-modules: Allow aliases as dependencies in the SUSE INITRD
+  REQUIRES syntax (bnc#730617).
+
+---
+Tue Nov 22 11:02:18 UTC 2011 - mma...@suse.cz
+
+- setup-modules: Fix adding more than one additional dependency to
+  modules (bnc#730617).
+
+---
 Mon Nov  7 12:54:16 UTC 2011 - mma...@suse.cz
 
 - Revert the NO_KMS_IN_INITRD - KMS_IN_INITRD rename, it breaks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-modules.sh 
new/mkinitrd-2.7.0/scripts/setup-modules.sh
--- old/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-11-09 23:19:02.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-11-22 13:49:46.0 
+0100
@@ -150,7 +150,7 @@
 else
 number=0
 added=0
-for entry in ${additional_module_dependencies[@]} ; do
+for entry in ${additional_module_dependencies[@]} ; do
 local module2 requirements2 val
 module2=${entry/:*}
 requirements2=${entry/*:}
@@ -181,52 +181,25 @@
 #   Checks for a given kernel modules if there are additional dependencies
 #   found by load_additional_dependencies.
 #
-#   Prints a list (separated by ' ') of modules if there are additional
-#   dependencies.
+#   Prints a list (separated by whitespace or newlines) of modules
+#   if there are additional dependencies.
 #
 # Parameters
 #   mod: the module for which additional depdencies should be found
-#   ver: the kernel version
-#   recursive: recursive call if 1, don't print the final newline
-#
-# Return value
-#   0 (true) if there are additional dependencies, 1 (false) otherwise
 get_add_module_deps()
 {
 local mod=${1##*/}
-local version=$2
-local recursive=$3
-local printed=0
 mod=${mod%.ko}
 
 for entry in ${additional_module_dependencies[@]} ; do
-local module requirements m
+local module requirements
 
 module=${entry/:*}
 requirements=${entry/*:}
 if [ $module = $mod ] ; then
-for m in $requirements ; do
-filename=$(modinfo -k $version -F filename $m)
-if [ -z $filename ] ; then
-echo 2 Ignoring additional requirement $mod REQUIRES $m
-else
-echo -n $filename 
-get_add_module_deps $m $version 1
-printed=$[printed+1]
-fi
-done
+echo $requirements
 fi
 done
-
-# build the return value
-if [ $printed -ne 0 ] ; then
-if [ $recursive -ne 1 ] ; then
-echo 
-fi
-return 0
-fi
-
-return 1
 }
 
 # Resolve module dependencies and parameters. Returns a list of modules and
@@ -236,6 +209,7 @@
 local module=
 local supported=
 local additional_args=
+local seen=
 shift
 
 if ! check_supported_kernel $kernel_version ; then
@@ -248,6 +222,7 @@
 module=${module##*/}
 shift
 
+seen=$seen $module
 # don't use a modprobe.conf 

commit mkinitrd for openSUSE:Factory

2011-11-14 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2011-11-14 13:17:06

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2011-11-08 
09:31:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2011-11-14 
13:17:08.0 +0100
@@ -226,0 +227,5 @@
+Thu Sep  2 13:22:46 CEST 2010 - mma...@suse.cz
+
+- Do not use the chroot binary from the target system (bnc#635856).
+
+---



Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-11-07 13:55:24.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-11-09 23:19:02.0 +0100
@@ -224,6 +224,11 @@
 - Fix for new coreutils (bnc#654364).
 
 ---
+Thu Sep  2 13:22:46 CEST 2010 - mma...@suse.cz
+
+- Do not use the chroot binary from the target system (bnc#635856).
+
+---
 Wed Aug 25 15:05:03 CEST 2010 - mma...@suse.cz
 
 - setup-modules.sh: Cleanup.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-boot.sh 
new/mkinitrd-2.7.0/scripts/boot-boot.sh
--- old/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-11-07 13:55:24.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-11-09 23:19:02.0 
+0100
@@ -19,7 +19,6 @@
 selinux_load_policy()
 {
local NEWROOT=$1
-   local CR=${NEWROOT}/usr/bin/chroot
 
local SELINUX=enforcing
[ -e $NEWROOT/etc/selinux/config ]  . $NEWROOT/etc/selinux/config
@@ -48,10 +47,10 @@
# load_policy does mount /proc and /selinux in
# libselinux,selinux_init_load_policy()
if [ -x $NEWROOT/sbin/load_policy ]; then
-   $CR $NEWROOT /sbin/load_policy -i
+   chroot $NEWROOT /sbin/load_policy -i
ret=$?
else
-   $CR $NEWROOT /usr/sbin/load_policy -i
+   chroot $NEWROOT /usr/sbin/load_policy -i
ret=$?
fi
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-11-08 Thread h_root
Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2011-11-08 09:31:26

Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and  /work/SRC/openSUSE:Factory/.mkinitrd.new (New)


Package is mkinitrd, Maintainer is mma...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes2011-10-19 
13:42:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2011-11-08 
09:31:28.0 +0100
@@ -1,0 +2,6 @@
+Mon Nov  7 12:54:16 UTC 2011 - mma...@suse.cz
+
+- Revert the NO_KMS_IN_INITRD - KMS_IN_INITRD rename, it breaks
+  other scripts for no good reason (bnc#619218#c12).
+
+---



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.jDAtNH/_old  2011-11-08 09:31:29.0 +0100
+++ /var/tmp/diff_new_pack.jDAtNH/_new  2011-11-08 09:31:29.0 +0100
@@ -116,16 +116,9 @@
 install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
 %post
-%{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD}
 %{fillup_only -an kernel}
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
 %{fillup_and_insserv -f -Y purge-kernels}
-case $NO_KMS_IN_INITRD in
-   no)
-   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
-   yes)
-   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
-esac
 
 %postun
 %insserv_cleanup

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd 
new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd
--- old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd2011-10-18 
10:45:45.0 +0200
+++ new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd2011-11-07 
13:55:24.0 +0100
@@ -9,7 +9,7 @@
 #
 INITRD_MODULES=
 
-## Type:string(yes)
+## Type:yesno
 ## Command: /sbin/mkinitrd
 ## Default: 
 #
@@ -19,7 +19,7 @@
 # supported on the underlying hardware.
 # After changing run mkinitrd again.
 #
-KMS_IN_INITRD=yes
+NO_KMS_IN_INITRD=no
  
 ## Type:string
 ## Command: /sbin/mkinitrd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-10-18 10:45:45.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-11-07 13:55:24.0 +0100
@@ -1,4 +1,10 @@
 ---
+Mon Nov  7 12:54:16 UTC 2011 - mma...@suse.cz
+
+- Revert the NO_KMS_IN_INITRD - KMS_IN_INITRD rename, it breaks
+  other scripts for no good reason (bnc#619218#c12).
+
+---
 Tue Oct 18 08:45:11 UTC 2011 - mma...@suse.cz
 
 - Do not create /dev/shm/initrd_exports.sh, it was only needed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec 
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2011-10-18 10:45:45.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.spec2011-11-07 13:55:24.0 +0100
@@ -116,16 +116,9 @@
 install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
 %post
-%{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD}
 %{fillup_only -an kernel}
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
 %{fillup_and_insserv -f -Y purge-kernels}
-case $NO_KMS_IN_INITRD in
-   no)
-   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
-   yes)
-   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
-esac
 
 %postun
 %insserv_cleanup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-kms.sh 
new/mkinitrd-2.7.0/scripts/setup-kms.sh
--- old/mkinitrd-2.7.0/scripts/setup-kms.sh 2011-10-18 10:45:45.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-kms.sh 2011-11-07 13:55:24.0 
+0100
@@ -250,7 +250,7 @@
 
 ## end of functions ##
 
-if [ $KMS_IN_INITRD != no ]  pciids_on_system
+if [ $NO_KMS_IN_INITRD != yes ]  pciids_on_system
 then
 
 gfx_modules=$(class_drivers $kernel_version $supported_classes)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-10-12 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Wed Oct 12 16:13:08 CEST 2011.




--- openSUSE:Factory/mkinitrd/mkinitrd.changes  2011-10-11 17:03:59.0 
+0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-10-11 
15:54:40.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct 11 13:50:35 UTC 2011 - mma...@suse.com
+
+- Include thermal, processor and fan acpi modules on x86 and ia64
+  (bnc#716785#c11).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-10-07 11:04:55.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-10-11 15:54:14.0 +0200
@@ -1,4 +1,10 @@
 ---
+Tue Oct 11 13:50:35 UTC 2011 - mma...@suse.com
+
+- Include thermal, processor and fan acpi modules on x86 and ia64
+  (bnc#716785#c11).
+
+---
 Fri Oct  7 08:50:45 UTC 2011 - mma...@suse.cz
 
 - Fix the module dependency resolver to include dependencies of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-acpi.sh 
new/mkinitrd-2.7.0/scripts/boot-acpi.sh
--- old/mkinitrd-2.7.0/scripts/boot-acpi.sh 1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-acpi.sh 2011-10-11 15:54:14.0 
+0200
@@ -0,0 +1,4 @@
+#!/bin/bash
+#%stage: boot
+#%modules: $acpi_modules
+#%if: -n $acpi_modules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-acpi.sh 
new/mkinitrd-2.7.0/scripts/setup-acpi.sh
--- old/mkinitrd-2.7.0/scripts/setup-acpi.sh2011-10-07 11:04:55.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-acpi.sh2011-10-11 15:54:14.0 
+0200
@@ -55,3 +55,7 @@
 
 attach_dsdt
 
+case $(uname -m) in
+i?86 | x86_64 | ia64)
+   acpi_modules=thermal processor fan
+esac

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-10-11 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Oct 11 17:04:04 CEST 2011.




--- openSUSE:Factory/mkinitrd/mkinitrd.changes  2011-10-04 18:13:42.0 
+0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-10-07 
11:05:09.0 +0200
@@ -1,0 +2,6 @@
+Fri Oct  7 08:50:45 UTC 2011 - mma...@suse.cz
+
+- Fix the module dependency resolver to include dependencies of
+  sd_mod (bnc#722484).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-09-22 14:26:43.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-10-07 11:04:55.0 +0200
@@ -1,4 +1,15 @@
 ---
+Fri Oct  7 08:50:45 UTC 2011 - mma...@suse.cz
+
+- Fix the module dependency resolver to include dependencies of
+  sd_mod (bnc#722484).
+
+---
+Fri Sep 30 15:38:07 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc macro
+
+---
 Thu Sep 22 12:18:39 UTC 2011 - mma...@suse.cz
 
 - Include sd_mod if scsi_mod is used (bnc#714924).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec 
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec2011-09-22 14:26:43.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.spec2011-10-07 11:04:55.0 +0200
@@ -74,8 +74,8 @@
 %setup
 
 %build
-gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
-gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/warpclock src/warpclock.c
+%__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
+%__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/warpclock src/warpclock.c
 make -C man
 sed -i s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/ 
sbin/mkinitrd
 echo Checking scripts:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-modules.sh 
new/mkinitrd-2.7.0/scripts/setup-modules.sh
--- old/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-09-22 14:26:43.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-10-07 11:04:55.0 
+0200
@@ -242,10 +242,11 @@
 additional_args=--allow-unsupported-modules
 fi
 
-for module in $@; do
-module=${module%.gz}
-module=${module%.o}  # strip trailing .o just in case.
-module=${module%.ko}  # strip trailing .ko just in case.
+while test $# -gt 0; do
+module=${1%.gz}
+module=${module%.ko}
+module=${module##*/}
+shift
 
 # don't use a modprobe.conf to get rid of the install lines
 module_list=$(/sbin/modprobe \
@@ -261,7 +262,7 @@
 fi
 module_list=$(echo $module_list | sed -rn 's/^insmod +([^ 
]+).*/\1/p')
 for mod in $module_list ; do
-if ! $(echo $resolved_modules | grep -q $mod) ; then
+if ! $(echo $resolved_modules | grep -qF $mod) ; then
 resolved_modules=$resolved_modules $mod
 
 # check for additional requirements specified by
@@ -271,8 +272,10 @@
 local req
 
 for req in $additional_reqs ; do
-if ! $(echo $resolved_modules | grep -q $req) ; then
-resolved_modules=$resolved_modules $req
+if ! $(echo $resolved_modules | grep -qF $req) ; then
+# put $req on the todo list to check for it's
+# dependencies
+set -- $@ $req
 fi
 done
 fi

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-10-04 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Oct 4 18:13:45 CEST 2011.




--- openSUSE:Factory/mkinitrd/mkinitrd.changes  2011-09-23 11:48:39.0 
+0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-09-30 
17:38:16.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 30 15:38:07 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc macro
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.Q1DMX4/_old  2011-10-04 18:13:40.0 +0200
+++ /var/tmp/diff_new_pack.Q1DMX4/_new  2011-10-04 18:13:40.0 +0200
@@ -74,8 +74,8 @@
 %setup
 
 %build
-gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
-gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/warpclock src/warpclock.c
+%__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
+%__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/warpclock src/warpclock.c
 make -C man
 sed -i s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/ 
sbin/mkinitrd
 echo Checking scripts:

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-09-23 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Fri Sep 23 10:36:06 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-09-21 10:25:00.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-09-22 
14:27:40.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 22 12:18:39 UTC 2011 - mma...@suse.cz
+
+- Include sd_mod if scsi_mod is used (bnc#714924).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-09-21 10:20:18.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-09-22 14:26:43.0 +0200
@@ -1,4 +1,9 @@
 ---
+Thu Sep 22 12:18:39 UTC 2011 - mma...@suse.cz
+
+- Include sd_mod if scsi_mod is used (bnc#714924).
+
+---
 Wed Sep 21 08:19:47 UTC 2011 - mma...@suse.cz
 
 - setup-network: 77-network.rules has moved to /lib/udev/rules.d/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-block.sh 
new/mkinitrd-2.7.0/scripts/setup-block.sh
--- old/mkinitrd-2.7.0/scripts/setup-block.sh   2011-09-21 10:20:18.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-block.sh   2011-09-22 14:26:43.0 
+0200
@@ -88,7 +88,6 @@
 case $blkdev in
 sd*)
 handle_scsi $blkdev result
-result=$result sd_mod
 ;;
 hd*)
 devpath=$(cd -P /sys/block/$blkdev/device; echo $PWD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-modules.sh 
new/mkinitrd-2.7.0/scripts/setup-modules.sh
--- old/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-09-21 10:20:18.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-modules.sh 2011-09-22 14:26:43.0 
+0200
@@ -13,6 +13,7 @@
 # in the load_additional_dependencies function.
 additional_module_dependencies=(
 virtio:virtio_pci virtio_ring
+scsi_mod:sd_mod
 )
 
 # Check if module $1 is listed in $modules.






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-09-21 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Wed Sep 21 17:11:39 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-09-20 10:43:42.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-09-21 
10:25:00.0 +0200
@@ -1,0 +2,17 @@
+Wed Sep 21 08:19:47 UTC 2011 - mma...@suse.cz
+
+- setup-network: 77-network.rules has moved to /lib/udev/rules.d/
+  (bnc#707855).
+
+---
+Wed Sep 21 07:27:32 UTC 2011 - e...@suse.de
+
+- netconsole: Make the setup more robust and add error detection.
+
+---
+Tue Sep 20 21:20:09 UTC 2011 - mma...@suse.com
+
+- Add /etc/{protocols,netconfig,services} to the initrd
+  (bnc#714945).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-09-20 10:42:20.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-09-21 10:20:18.0 +0200
@@ -1,4 +1,21 @@
 ---
+Wed Sep 21 08:19:47 UTC 2011 - mma...@suse.cz
+
+- setup-network: 77-network.rules has moved to /lib/udev/rules.d/
+  (bnc#707855).
+
+---
+Wed Sep 21 07:27:32 UTC 2011 - e...@suse.de
+
+- netconsole: Make the setup more robust and add error detection.
+
+---
+Tue Sep 20 21:20:09 UTC 2011 - mma...@suse.com
+
+- Add /etc/{protocols,netconfig,services} to the initrd
+  (bnc#714945).
+
+---
 Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
 
 - purge-kernels: Also handle kernel-source packages (bnc#718753).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-netconsole.sh 
new/mkinitrd-2.7.0/scripts/boot-netconsole.sh
--- old/mkinitrd-2.7.0/scripts/boot-netconsole.sh   2011-09-20 
10:42:20.0 +0200
+++ new/mkinitrd-2.7.0/scripts/boot-netconsole.sh   2011-09-21 
10:20:18.0 +0200
@@ -23,9 +23,13 @@
 # no colon in NETCONSOLE = no port specified = use default
 netc_udpport=514  # syslog
 fi
-ping -c1 $netc_loghost /dev/null 21
-netc_lladdr=$(arp $netc_loghost | while read ip type mac o; do [ $mac != 
HWaddress ]  echo $mac; done)
-netc_ipaddr=$(arp -n | while read ip type mac o; do [ $mac == $netc_lladdr 
]  echo $ip; done)
-echo -e Netconsole:\tlog to $netc_loghost:$netc_udpport [ $netc_ipaddr / 
$netc_lladdr ] via $interface
+ping -w5 -c1 $netc_loghost /dev/null 21
+netc_lladdr=$(arp $netc_loghost | while read ip type mac o; do [ $mac != 
HWaddress -a $type != (incomplete) ]  { echo $mac; break; }; done)
+if [ z$netc_lladdr != z ]; then
+netc_ipaddr=$(arp -n | while read ip type mac o; do [ $mac == 
$netc_lladdr ]  { echo $ip; break; }; done)
+echo -e Netconsole:\tlog to $netc_loghost:$netc_udpport [ $netc_ipaddr / 
$netc_lladdr ] via $interface
 
-add_module_param netconsole 
netconsole=@/,${netc_udpport}@${netc_ipaddr}/${netc_lladdr}
+add_module_param netconsole 
netconsole=@/,${netc_udpport}@${netc_ipaddr}/${netc_lladdr}
+else
+echo -e Cannot configure netconsole: cannot find logging host 
$netc_loghost on $interface
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2011-09-20 10:42:20.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-09-21 10:20:18.0 
+0200
@@ -286,9 +286,8 @@
 cp /etc/resolv.conf $tmp_mnt/etc
 fi
 
-# Copy /etc/hosts in any case to be able to resolve static host names in the
-# initrd (bnc #468090)
-cp /etc/hosts $tmp_mnt/etc
+# Copy netcfg files (bnc#468090, bnc#714945)
+cp /etc/{hosts,protocols,services,netconfig} $tmp_mnt/etc
 
 # Get static IP configuration if requested
 for iface in $static_interfaces; do
@@ -302,14 +301,18 @@
 if [ -f /etc/udev/rules.d/70-persistent-net.rules ] ; then
 cp /etc/udev/rules.d/70-persistent-net.rules $tmp_mnt/etc/udev/rules.d
 fi
-if [ -f /etc/udev/rules.d/77-network.rules ] ; then
-cp /etc/udev/rules.d/77-network.rules $tmp_mnt/etc/udev/rules.d
+for f in /{lib,etc}/udev/rules.d/77-network.rules; do
+if ! test -e $f; then
+continue
+fi
+cp --parents $f $tmp_mnt/
 cp_bin /sbin/ifup $tmp_mnt/sbin/ifup
 cp_bin /bin/awk 

commit mkinitrd for openSUSE:Factory

2011-09-20 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Sep 20 12:58:48 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-08-30 14:14:07.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-09-20 
10:43:42.0 +0200
@@ -1,0 +2,5 @@
+Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
+
+- purge-kernels: Also handle kernel-source packages (bnc#718753).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.TA97IP/_old  2011-09-20 12:58:43.0 +0200
+++ /var/tmp/diff_new_pack.TA97IP/_new  2011-09-20 12:58:43.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:29
+Release:3
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-08-30 14:12:52.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-09-20 10:42:20.0 +0200
@@ -1,4 +1,9 @@
 ---
+Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
+
+- purge-kernels: Also handle kernel-source packages (bnc#718753).
+
+---
 Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
 
 - Fix mkinitrd -d rootdev (bnc#714650).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/purge-kernels 
new/mkinitrd-2.7.0/sbin/purge-kernels
--- old/mkinitrd-2.7.0/sbin/purge-kernels   2011-08-30 14:12:52.0 
+0200
+++ new/mkinitrd-2.7.0/sbin/purge-kernels   2011-09-20 10:42:20.0 
+0200
@@ -71,11 +71,13 @@
($flavor = $name) =~ s/.*-kmp-//;
$table = \%kmps;
}
-   $flavor =~ s/-.*//; # XXX: No dashes in flavor names
-   if ($flavor eq devel) {
-   # kernel-devel is a subpackage of kernel-source
-   $flavor = source;
+   # Put all subpackages into the same group, except for
+   # kernel-source-{vanilla,rt}, which are packages on their own
+   if ($flavor !~ /^source/) {
+   $flavor =~ s/-.*//; # XXX: No dashes in flavor names
}
+   # kernel-devel is a subpackage of kernel-source
+   $flavor =~ s/^devel/source/;
$table-{$arch/$flavor} ||= {};
$table-{$arch/$flavor}{$vr} ||= [];
push(@{$table-{$arch/$flavor}{$vr}}, $name-$vr.$arch);
@@ -130,23 +132,21 @@
 sub list_old_packages {
my ($flavor) = @_;
 
-   # ignore kernel-source for now
-   return if $flavor =~ /\/source$/;
-
+   my $is_source = $flavor =~ /\/source/;
my $kernels = $kernels{$flavor};
my @versions = sort_versions(keys(%$kernels));
my %idx = (
oldest = 0,
latest = scalar(@versions) - 1,
);
-   if ($want_running  $running_flavor eq $flavor) {
+   if ($want_running  ($running_flavor eq $flavor || $is_source)) {
for (my $i = scalar(@versions) - 1; $i = 0; $i--) {
if (version_match($running_version, $versions[$i])) {
$idx{running} = $i;
last;
}
}
-   if (!exists($idx{running})) {
+   if (!exists($idx{running})  !$is_source) {
print STDERR $0: Running kernel 
$running_version-$running_flavor not installed.\n;
print NOT removing any packages for flavor $flavor.\n;
return;






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-08-30 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Aug 30 16:07:42 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-08-20 14:27:46.0 +0200
+++ mkinitrd/mkinitrd.changes   2011-08-30 14:14:07.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
+
+- Fix mkinitrd -d rootdev (bnc#714650).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.5BKDLg/_old  2011-08-30 16:07:07.0 +0200
+++ /var/tmp/diff_new_pack.5BKDLg/_new  2011-08-30 16:07:07.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:27
+Release:29
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-08-20 14:26:40.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-30 14:12:52.0 +0200
@@ -1,4 +1,9 @@
 ---
+Tue Aug 30 12:12:03 UTC 2011 - co...@suse.de
+
+- Fix mkinitrd -d rootdev (bnc#714650).
+
+---
 Sat Aug 20 12:26:20 UTC 2011 - mma...@suse.cz
 
 - Fix mkinitrd -D default (bnc#713103).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-storage.sh 
new/mkinitrd-2.7.0/scripts/setup-storage.sh
--- old/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-08-20 14:26:40.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-08-30 14:12:52.0 
+0200
@@ -264,11 +264,13 @@
 local cpio major minor x1
 local fstab_device fstab_mountpoint fstab_type fstab_options dummy
 
+cpio=`echo $mountpoint | /bin/cpio --quiet -o -H newc`
+major=$(echo $(( 0x${cpio:62:8} )) )
+minor=$(echo $(( 0x${cpio:70:8} )) )
+
 if [ -z ${!var_dev} ] ; then
 # no dev specified, get current opts from /etc/fstab and device from 
stat
-cpio=`echo $mountpoint | /bin/cpio --quiet -o -H newc`
-major=$(echo $(( 0x${cpio:62:8} )) )
-minor=$(echo $(( 0x${cpio:70:8} )) )
+
# check if /usr is part of /
 if test $name = usr -a $major:$minor = $rootmajor:$rootminor; 
then
 return
@@ -299,6 +301,8 @@
 update_blockdev $dev
 dev=$(beautify_blockdev $dev)
 fi
+else
+dev=${!var_dev}
 fi
 
 #if we don't know where the device belongs to






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-08-22 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Mon Aug 22 15:43:53 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-08-01 17:18:46.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-08-20 
14:27:46.0 +0200
@@ -1,0 +2,29 @@
+Sat Aug 20 12:26:20 UTC 2011 - mma...@suse.cz
+
+- Fix mkinitrd -D default (bnc#713103).
+
+---
+Tue Aug  9 14:51:37 UTC 2011 - h...@suse.de
+
+- Add the 'root' argument in the call to check_for_device()
+  (bnc#699870).
+
+---
+Thu Aug  4 10:36:54 CEST 2011 - fcro...@suse.com
+
+- Output fsck result on root partition to /run/initramfs/root-fsck,
+  to prevent systemd to do it again.
+
+---
+Wed Aug  3 13:35:19 UTC 2011 - mma...@suse.cz
+
+- Mount the /usr filesystem in the initrd
+  It has still some rough edges, like support for journal device or
+  booting from nfs, but simple cases should work.
+
+---
+Tue Aug  2 12:12:04 UTC 2011 - mma...@novell.com
+
+- Run cpio with the --quiet option.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.QATsOV/_old  2011-08-22 15:42:57.0 +0200
+++ /var/tmp/diff_new_pack.QATsOV/_new  2011-08-22 15:42:57.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:25
+Release:27
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-08-01 17:10:21.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-20 14:26:40.0 +0200
@@ -1,4 +1,33 @@
 ---
+Sat Aug 20 12:26:20 UTC 2011 - mma...@suse.cz
+
+- Fix mkinitrd -D default (bnc#713103).
+
+---
+Tue Aug  9 14:51:37 UTC 2011 - h...@suse.de
+
+- Add the 'root' argument in the call to check_for_device()
+  (bnc#699870).
+
+---
+Thu Aug  4 10:36:54 CEST 2011 - fcro...@suse.com
+
+- Output fsck result on root partition to /run/initramfs/root-fsck,
+  to prevent systemd to do it again.
+
+---
+Wed Aug  3 13:35:19 UTC 2011 - mma...@suse.cz
+
+- Mount the /usr filesystem in the initrd
+  It has still some rough edges, like support for journal device or
+  booting from nfs, but simple cases should work.
+
+---
+Tue Aug  2 12:12:04 UTC 2011 - mma...@novell.com
+
+- Run cpio with the --quiet option.
+
+---
 Mon Aug  1 15:09:15 UTC 2011 - mma...@suse.cz
 
 - Only copy /usr/bin/on_ac_power if it exists (bnc#708326).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/lsinitrd 
new/mkinitrd-2.7.0/sbin/lsinitrd
--- old/mkinitrd-2.7.0/sbin/lsinitrd2011-08-01 17:10:21.0 +0200
+++ new/mkinitrd-2.7.0/sbin/lsinitrd2011-08-20 14:26:40.0 +0200
@@ -70,11 +70,11 @@
 
 if [ $config -eq 1 ] ; then
 # yes, that's snow, but doesn't use any temporary files :)
-for configfile in $(zcat $initrd | cpio $args 2/dev/null | grep 
'^config/') ; do
+for configfile in $(zcat $initrd | cpio $args --quiet | grep '^config/') ; 
do
 echo = $configfile 
-zcat $initrd | cpio -i --to-stdout $configfile 2/dev/null
+zcat $initrd | cpio --quiet -i --to-stdout $configfile
 echo
 done
 else
-zcat $initrd | cpio $args
+zcat $initrd | cpio --quiet $args
 fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-boot.sh 
new/mkinitrd-2.7.0/scripts/boot-boot.sh
--- old/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-08-01 17:10:21.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-08-20 14:26:40.0 
+0200
@@ -2,7 +2,7 @@
 #
 #%stage: setup
 #%depends: killprogs
-#%programs:
+#%programs: chroot
 #%modules:
 #%dontshow
 #
@@ -86,6 +86,15 @@
umount -l /run
 fi
 
+# Mount the /usr filesystem if possible
+# XXX: handle journaldev for the /usr device separately
+if test -n $usrdev; then
+   if chroot /root 

commit mkinitrd for openSUSE:Factory

2011-08-02 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Aug 2 08:56:33 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-07-29 16:04:36.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-08-01 
17:18:46.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug  1 15:09:15 UTC 2011 - mma...@suse.cz
+
+- Only copy /usr/bin/on_ac_power if it exists (bnc#708326).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.RLeiS1/_old  2011-08-02 08:55:44.0 +0200
+++ /var/tmp/diff_new_pack.RLeiS1/_new  2011-08-02 08:55:44.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:23
+Release:25
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-07-29 15:47:20.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-01 17:10:21.0 +0200
@@ -1,4 +1,9 @@
 ---
+Mon Aug  1 15:09:15 UTC 2011 - mma...@suse.cz
+
+- Only copy /usr/bin/on_ac_power if it exists (bnc#708326).
+
+---
 Fri Jul 29 13:46:54 UTC 2011 - mma...@suse.cz
 
 - Add the dmesg utility for easier debugging.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-mount.sh 
new/mkinitrd-2.7.0/scripts/boot-mount.sh
--- old/mkinitrd-2.7.0/scripts/boot-mount.sh2011-07-29 15:47:20.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-mount.sh2011-08-01 17:10:21.0 
+0200
@@ -3,7 +3,7 @@
 #%stage: filesystem
 #%depends: resume
 #
-#%programs: /sbin/fsck $rootfsck /bin/on_ac_power
+#%programs: /sbin/fsck $rootfsck
 #%if: ! $root_already_mounted
 #%dontshow
 #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-mount.sh 
new/mkinitrd-2.7.0/scripts/setup-mount.sh
--- old/mkinitrd-2.7.0/scripts/setup-mount.sh   2011-07-29 15:47:20.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-mount.sh   2011-08-01 17:10:21.0 
+0200
@@ -20,5 +20,12 @@
 
 verbose [MOUNT] Root:\t$rootdev
 
+for file in {/usr,}/bin/on_ac_power; do
+if test -e $file; then
+cp_bin $file $tmp_mnt/usr/bin
+break
+fi
+done
+
 save_var rootdev
 save_var rootfsck






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-08-01 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Mon Aug 1 10:03:20 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-07-20 11:03:08.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-07-29 
16:04:36.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 29 13:46:54 UTC 2011 - mma...@suse.cz
+
+- Add the dmesg utility for easier debugging.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.bzZcsB/_old  2011-08-01 10:02:13.0 +0200
+++ /var/tmp/diff_new_pack.bzZcsB/_new  2011-08-01 10:02:13.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:21
+Release:23
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-07-20 11:01:50.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-07-29 15:47:20.0 +0200
@@ -1,4 +1,9 @@
 ---
+Fri Jul 29 13:46:54 UTC 2011 - mma...@suse.cz
+
+- Add the dmesg utility for easier debugging.
+
+---
 Wed Jul 20 08:32:49 UTC 2011 - mma...@novell.com
 
 - Fix typo in boot-mount.sh (bnc#704867#c6).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-start.sh 
new/mkinitrd-2.7.0/scripts/boot-start.sh
--- old/mkinitrd-2.7.0/scripts/boot-start.sh2011-07-20 11:01:50.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-start.sh2011-07-29 15:47:20.0 
+0200
@@ -2,7 +2,7 @@
 #
 #%stage: boot
 #%depends: devfunctions
-#%programs: /bin/bash umount mount mknod mkdir ln date sleep cat /bin/sed 
/sbin/insmod /sbin/modprobe kill /sbin/killall5 /sbin/halt /sbin/reboot 
/sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/*
+#%programs: /bin/bash umount mount mknod mkdir ln date sleep cat /bin/sed 
/sbin/insmod /sbin/modprobe kill /sbin/killall5 /sbin/halt /sbin/reboot 
/sbin/showconsole cp /sbin/pidof mv chmod rm true ls /lib/mkinitrd/bin/* dmesg
 #%modules: $RESOLVED_INITRD_MODULES
 #%udevmodules: $RESOLVED_INITRD_MODULES_UDEV
 #%dontshow






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-07-22 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Fri Jul 22 09:02:00 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-07-18 13:39:12.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-07-20 
11:03:08.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 20 08:32:49 UTC 2011 - mma...@novell.com
+
+- Fix typo in boot-mount.sh (bnc#704867#c6).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.bo1oUb/_old  2011-07-22 08:59:32.0 +0200
+++ /var/tmp/diff_new_pack.bo1oUb/_new  2011-07-22 08:59:32.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:19
+Release:21
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-07-18 13:17:18.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-07-20 11:01:50.0 +0200
@@ -1,4 +1,9 @@
 ---
+Wed Jul 20 08:32:49 UTC 2011 - mma...@novell.com
+
+- Fix typo in boot-mount.sh (bnc#704867#c6).
+
+---
 Mon Jul 18 11:16:42 UTC 2011 - mma...@novell.com
 
 - purge-kernels: Fix matching of -rc kernels.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-mount.sh 
new/mkinitrd-2.7.0/scripts/boot-mount.sh
--- old/mkinitrd-2.7.0/scripts/boot-mount.sh2011-07-18 13:17:18.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-mount.sh2011-07-20 11:01:50.0 
+0200
@@ -79,7 +79,7 @@
 if [ -z $rootfstype -a -x /sbin/udevadm -a -n $sysdev ]; then
 eval $(/sbin/udevadm info -q env -p $sysdev | sed -n '/ID_FS_TYPE/p')
 rootfstype=$ID_FS_TYPE
-[ -n $rootfstype ]  [ $rootfstype = unknown ]  $rootfstype=
+[ -n $rootfstype ]  [ $rootfstype = unknown ]  rootfstype=
 ID_FS_TYPE=
 fi
 






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-07-19 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Jul 19 14:16:23 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-06-30 23:11:12.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-07-18 
13:39:12.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 18 11:16:42 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Fix matching of -rc kernels.
+
+---
@@ -56,0 +62,5 @@
+
+---
+Thu Jun  2 11:35:12 UTC 2011 - mma...@novell.com
+
+- Map /dev/fio* to the iomemory-vsl driver (bnc#695620).

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.pA4HFq/_old  2011-07-19 14:09:51.0 +0200
+++ /var/tmp/diff_new_pack.pA4HFq/_new  2011-07-19 14:09:51.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:17
+Release:19
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-06-30 23:10:43.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-07-18 13:17:18.0 +0200
@@ -1,4 +1,9 @@
 ---
+Mon Jul 18 11:16:42 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Fix matching of -rc kernels.
+
+---
 Thu Jun 30 21:07:11 UTC 2011 - mma...@novell.com
 
 - Allow scripts to set multiple interfaces in the $interface
@@ -56,6 +61,11 @@
 - boot-start: Mount /run without noexec to match systemd.
 
 ---
+Thu Jun  2 11:35:12 UTC 2011 - mma...@novell.com
+
+- Map /dev/fio* to the iomemory-vsl driver (bnc#695620).
+
+---
 Mon May  9 16:55:56 CEST 2011 - r...@suse.de
 
 - move sysconfig/kernel related parts to this package 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/purge-kernels 
new/mkinitrd-2.7.0/sbin/purge-kernels
--- old/mkinitrd-2.7.0/sbin/purge-kernels   2011-06-30 23:10:43.0 
+0200
+++ new/mkinitrd-2.7.0/sbin/purge-kernels   2011-07-18 13:17:18.0 
+0200
@@ -250,6 +250,16 @@
chomp($running_version);
($running_flavor = $running_version) =~ s/.*-//;
$running_version =~ s/-[^-]*$//;
+   (my $release = $running_version) =~ s/.*-//;
+   $running_version =~ s/-[^-]*$//;
+
+   # copied from kernel-source/rpm/mkspec
+   $running_version =~ s/\.0-rc/.rc/;
+   $running_version =~ s/-rc\d+//;
+   $running_version =~ s/-/./g;
+
+   $running_version .= -$release;
+
my $arch = `uname -m`;
chomp($arch);
$arch =~ s/^i.86$/i586/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-block.sh 
new/mkinitrd-2.7.0/scripts/setup-block.sh
--- old/mkinitrd-2.7.0/scripts/setup-block.sh   2011-06-30 23:10:43.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-block.sh   2011-07-18 13:17:18.0 
+0200
@@ -127,6 +127,9 @@
 mmc*)
 result=mmc_block
 ;;
+fio*)
+result=iomemory-vsl
+;;
 *)
 if [ ! -d /sys/block/$blkdev/device ] ; then
 echo Device $blkdev not handled 2






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-07-01 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Fri Jul 1 16:31:50 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-06-22 17:32:36.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-06-30 
23:11:12.0 +0200
@@ -1,0 +2,11 @@
+Thu Jun 30 21:07:11 UTC 2011 - mma...@novell.com
+
+- Allow scripts to set multiple interfaces in the $interface
+  variable (fate#311345).
+
+---
+Thu Jun 30 09:47:17 UTC 2011 - mma...@novell.com
+
+- Fix typo in resolve_device() (bnc#698946).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.Vyvuzr/_old  2011-07-01 16:29:38.0 +0200
+++ /var/tmp/diff_new_pack.Vyvuzr/_new  2011-07-01 16:29:38.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:15
+Release:17
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-06-22 17:28:22.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-06-30 23:10:43.0 +0200
@@ -1,4 +1,15 @@
 ---
+Thu Jun 30 21:07:11 UTC 2011 - mma...@novell.com
+
+- Allow scripts to set multiple interfaces in the $interface
+  variable (fate#311345).
+
+---
+Thu Jun 30 09:47:17 UTC 2011 - mma...@novell.com
+
+- Fix typo in resolve_device() (bnc#698946).
+
+---
 Wed Jun 22 15:02:26 UTC 2011 - mma...@novell.com
 
 - dcbd was replaced with lldpad.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh 
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2011-06-22 17:28:22.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-06-30 23:10:43.0 
+0200
@@ -177,7 +177,7 @@
 # get the default interface if requested
 if [ $interface = default ]; then
 interface=
-if -z $static_interfaces$dhcp_interfaces; then
+if test -z $static_interfaces$dhcp_interfaces; then
 ifspec=$(get_default_interface)
 case ${ifspec##*/} in
 dhcp*)
@@ -190,6 +190,22 @@
 fi
 fi
 
+for iface in $interface; do
+cfg=/etc/sysconfig/network/ifcfg-$iface
+BOOTPROTO=
+if test -e $cfg; then
+eval $(grep BOOTPROTO $cfg)
+fi
+case $BOOTPROTO in
+dhcp*)
+dhcp_interfaces=$dhcp_interfaces $iface
+;;
+*)
+static_interfaces=$static_interfaces $iface
+esac
+done
+interface=
+
 if [ $create_monster_initrd ]; then
 # include all network card modules
 for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/net 
-name *.ko -o -name *.ko.gz); do
@@ -199,16 +215,18 @@
 done
 fi
 
-if test -n $interface; then
-echo XXX: \$interface still set (to $interface), should not happen. 2
-fi
-
 static=true
+seen_interfaces=
 for iface in $static_interfaces -- $dhcp_interfaces; do
 if test x$iface = x--; then
 static=false
 continue
 fi
+case  $seen_interfaces  in
+* $iface *)
+continue
+esac
+seen_interfaces=$seen_interfaces $iface
 if [ -d /sys/class/net/$iface/device ] ; then
 drvlink=$drvlink $(get_network_module $iface)
 read macaddress  /sys/class/net/$iface/address
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-storage.sh 
new/mkinitrd-2.7.0/scripts/setup-storage.sh
--- old/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-06-22 17:28:22.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-06-30 23:10:43.0 
+0200
@@ -216,7 +216,7 @@
 case $realrootdev in
   LABEL=*|UUID=*)
 # get real root via fsck hack
-realrootdev=$(fsck -N $rootdev \
+realrootdev=$(fsck -N $realrootdev \
   | sed -ne '2s/.* \/dev/\/dev/p' \
   | sed -e 's/  *//g')
 if [ -z $realrootdev  -o ! -b $realrootdev ] ; then






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-06-22 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Wed Jun 22 10:48:16 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-06-16 15:39:59.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-06-21 
11:14:31.0 +0200
@@ -1,0 +2,19 @@
+Tue Jun 21 09:11:06 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Change the variable to multiversion.kernels to
+  match the syntax of other zypp variables.
+
+---
+Mon Jun 20 08:58:35 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Change the multiversion_kernels variable to a 
+  comma separated list, update help.
+
+---
+Sun Jun 19 13:25:10 UTC 2011 - mma...@novell.com
+
+- Add purge-kernels script to automatically delete old kernel packages
+  on boot, based on configuration in /etc/zypp/zypp.conf, variable
+  multiversion_kernels (fate#312018).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.zydSZO/_old  2011-06-22 10:48:03.0 +0200
+++ /var/tmp/diff_new_pack.zydSZO/_new  2011-06-22 10:48:03.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:11
+Release:13
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq
@@ -112,12 +112,14 @@
 %install_mkinitrd   /usr/bin/perl /sbin/mkinitrd_setup
 EOF
 install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/
+install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels
 install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
 %post
 %{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD}
 %{fillup_only -an kernel}
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
+%{fillup_and_insserv -f -Y purge-kernels}
 case $NO_KMS_IN_INITRD in
no)
sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
@@ -125,6 +127,9 @@
sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
 esac
 
+%postun
+%insserv_cleanup
+
 %posttrans
 /sbin/mkinitrd_setup
 
@@ -140,6 +145,7 @@
 %dir /lib/mkinitrd/setup
 %config /etc/rpm/macros.mkinitrd
 /etc/init.d/boot.loadmodules
+/etc/init.d/purge-kernels
 /lib/mkinitrd/scripts/*.sh
 /lib/mkinitrd/bin/*
 /bin/lsinitrd
@@ -147,6 +153,7 @@
 /sbin/mkinitrd_setup
 /sbin/module_upgrade
 /sbin/installkernel
+/sbin/purge-kernels
 /var/adm/fillup-templates/sysconfig.kernel-%name
 %doc %{_mandir}/man5/mkinitrd.5.gz
 %doc %{_mandir}/man8/mkinitrd.8.gz

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/etc/purge-kernels.init 
new/mkinitrd-2.7.0/etc/purge-kernels.init
--- old/mkinitrd-2.7.0/etc/purge-kernels.init   1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/etc/purge-kernels.init   2011-06-21 11:13:33.0 
+0200
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# Copyright (c) 2011 Novell, Inc.
+#
+### BEGIN INIT INFO
+# Provides:  purge-kernels
+# Required-Start:$local_fs
+# Required-Stop: $null
+# Default-Start: 3 5
+# Default-Stop:  $null
+# Short-Description: Purge old kernels
+# Description:   Purge old kernel as configured in /etc/zypp/zypp.conf
+### END INIT INFO
+
+case $1 in
+start)
+   ;;
+stop|try-restart|restart|force-reload|reload|status)
+   # not applicable
+   exit 0
+   ;;
+*)
+   echo Usage: $0 start
+   exit 1
+esac
+if test ! -e /boot/do_purge_kernels; then
+   exit 0
+fi
+
+. /etc/rc.status
+echo Removing old kernel packages...
+rm -f /boot/do_purge_kernels
+/sbin/purge-kernels
+rc_status -v
+rc_exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-06-16 15:33:46.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-06-21 11:13:33.0 +0200
@@ -1,4 +1,23 @@
 ---
+Tue Jun 21 09:11:06 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Change the variable to multiversion.kernels to
+  match the syntax of other zypp variables.
+
+---
+Mon Jun 20 08:58:35 UTC 2011 - mma...@novell.com
+
+- purge-kernels: Change the multiversion_kernels variable to a 
+  comma separated list, update help.
+
+---
+Sun Jun 19 13:25:10 UTC 2011 - mma...@novell.com
+
+- Add purge-kernels script to automatically delete old kernel 

commit mkinitrd for openSUSE:Factory

2011-06-17 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Fri Jun 17 10:19:16 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-06-14 15:57:35.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-06-16 
15:39:59.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 16 13:31:38 UTC 2011 - mma...@novell.com
+
+- Call udevadm trigger --action=add, because the default is change
+  in newer udev.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.SBmngy/_old  2011-06-17 10:18:26.0 +0200
+++ /var/tmp/diff_new_pack.SBmngy/_new  2011-06-17 10:18:26.0 +0200
@@ -31,7 +31,7 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:9
+Release:11
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-06-14 15:56:40.0 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-06-16 15:33:46.0 +0200
@@ -1,4 +1,10 @@
 ---
+Thu Jun 16 13:31:38 UTC 2011 - mma...@novell.com
+
+- Call udevadm trigger --action=add, because the default is change
+  in newer udev.
+
+---
 Tue Jun 14 13:56:11 UTC 2011 - mma...@novell.com
 
 - Add a note to the spec file that the package is maintained in git.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-udev.sh 
new/mkinitrd-2.7.0/scripts/boot-udev.sh
--- old/mkinitrd-2.7.0/scripts/boot-udev.sh 2011-06-14 15:56:40.0 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-udev.sh 2011-06-16 15:33:46.0 
+0200
@@ -27,5 +27,5 @@
 # Start udev
 echo Creating device nodes with udev
 /sbin/udevd --daemon
-/sbin/udevadm trigger
+/sbin/udevadm trigger --action=add
 wait_for_events






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit mkinitrd for openSUSE:Factory

2011-06-14 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Tue Jun 14 16:59:03 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-05-09 16:56:15.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-06-14 
15:57:35.0 +0200
@@ -1,0 +2,10 @@
+Tue Jun 14 13:56:11 UTC 2011 - mma...@novell.com
+
+- Add a note to the spec file that the package is maintained in git.
+
+---
+Tue Jun 14 13:30:07 UTC 2011 - mma...@novell.com
+
+- boot-start: Mount /run without noexec to match systemd.
+
+---

calling whatdependson for head-i586


Old:

  boot.loadmodules
  mkinitrd-kms_reverse.patch
  sysconfig.kernel-mkinitrd



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.lXxO4s/_old  2011-06-14 16:57:30.0 +0200
+++ /var/tmp/diff_new_pack.lXxO4s/_new  2011-06-14 16:57:30.0 +0200
@@ -31,16 +31,17 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:7
+Release:9
 Conflicts:  udev  118
 Requires:   dhcpcd
 PreReq: %fillup_prereq
 Summary:Creates an Initial RAM Disk Image for Preloading Modules
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
-Source1:boot.loadmodules
-Source2:sysconfig.kernel-%name
-Patch0: mkinitrd-kms_reverse.patch
+# Note: the whole package is maintained in this git repository, please
+# don't change it in the build service without sending the author a
+# pull request or patch first. Otherwise, you risk that your changes will be
+# silently overwritten by the next submission.
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -71,7 +72,6 @@
 
 %prep
 %setup
-%patch0
 
 %build
 gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
@@ -111,8 +111,8 @@
 #
 %install_mkinitrd   /usr/bin/perl /sbin/mkinitrd_setup
 EOF
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/boot.loadmodules
-install -m 644 %{SOURCE2} 
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kernel-%name
+install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/
+install -m 644 etc/sysconfig.kernel-mkinitrd 
$RPM_BUILD_ROOT/var/adm/fillup-templates/
 
 %post
 %{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD}
@@ -120,9 +120,9 @@
 %{insserv_force_if_yast /etc/init.d/boot.loadmodules}
 case $NO_KMS_IN_INITRD in
no)
-   sed -i -e s@^KMS_IN_INITRD=@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
+   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
yes)
-   sed -i -e s@^KMS_IN_INITRD=@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
+   sed -i -e s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
 esac
 
 %posttrans

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/etc/boot.loadmodules 
new/mkinitrd-2.7.0/etc/boot.loadmodules
--- old/mkinitrd-2.7.0/etc/boot.loadmodules 1970-01-01 01:00:00.0 
+0100
+++ new/mkinitrd-2.7.0/etc/boot.loadmodules 2011-06-14 15:56:40.0 
+0200
@@ -0,0 +1,51 @@
+#! /bin/sh
+#
+# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. All rights reserved.
+#
+# File: /etc/init.d/boot.loadmodules
+# Author: Jiri Srain jsr...@suse.cz
+#
+### BEGIN INIT INFO
+# Provides:  boot.loadmodules
+# Required-Start:boot.udev
+# Required-Stop: boot.udev
+# Default-Start: B
+# Default-Stop:
+# Short-Description: load modules required to be loaded in specific order
+# Description:   load modules required to be loaded in specific order
+### END INIT INFO
+
+. /etc/rc.status
+
+rc_reset
+
+case $1 in
+  start|restart)
+# Read variable for sysconfig and load all mentioned modules
+echo Loading required kernel modules
+. /etc/sysconfig/kernel
+for I in $MODULES_LOADED_ON_BOOT ; do
+   if ! modprobe -n $I  /dev/null 21 ; then continue ; fi
+   modprobe $I;
+done
+rc_status -v1 -r
+   ;;
+  stop)
+# skip / nothing to do
+;;
+  status)
+echo -n Checking if boot.loadmodules has run
+rc_reset
+for I in $MODULES_LOADED_ON_BOOT ; do
+   lsmod | grep -q ^$I  || rc_failed 3
+done
+rc_status -v
+;;
+  *)
+echo Usage: $0 {start|stop|status|restart}
+exit 1
+;;
+esac
+
+rc_exit
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd 
new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd
--- old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd1970-01-01 
01:00:00.0 +0100
+++ new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd

commit mkinitrd for openSUSE:Factory

2011-05-16 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Mon May 16 11:03:10 CEST 2011.




--- mkinitrd/mkinitrd.changes   2011-05-04 16:55:26.0 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-05-09 
16:56:15.0 +0200
@@ -1,0 +2,5 @@
+Mon May  9 16:55:56 CEST 2011 - r...@suse.de
+
+- move sysconfig/kernel related parts to this package 
+
+---

calling whatdependson for head-i586


New:

  boot.loadmodules
  mkinitrd-kms_reverse.patch
  sysconfig.kernel-mkinitrd



Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.F4PEKm/_old  2011-05-16 10:45:38.0 +0200
+++ /var/tmp/diff_new_pack.F4PEKm/_new  2011-05-16 10:45:38.0 +0200
@@ -31,12 +31,16 @@
 %endif
 AutoReqProv:on
 Version:2.7.0
-Release:5
+Release:7
 Conflicts:  udev  118
 Requires:   dhcpcd
+PreReq: %fillup_prereq
 Summary:Creates an Initial RAM Disk Image for Preloading Modules
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source0:mkinitrd.tar.bz2
+Source1:boot.loadmodules
+Source2:sysconfig.kernel-%name
+Patch0: mkinitrd-kms_reverse.patch
 Url:http://gitorious.org/opensuse/mkinitrd
 
 %description
@@ -67,6 +71,7 @@
 
 %prep
 %setup
+%patch0
 
 %build
 gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c
@@ -90,6 +95,8 @@
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/setup
 mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/boot
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp -a scripts/*.sh $RPM_BUILD_ROOT/lib/mkinitrd/scripts/
 cp -a lib/mkinitrd/bin $RPM_BUILD_ROOT/lib/mkinitrd/bin
 make -C sbin DESTDIR=$RPM_BUILD_ROOT install
@@ -104,6 +111,19 @@
 #
 %install_mkinitrd   /usr/bin/perl /sbin/mkinitrd_setup
 EOF
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/boot.loadmodules
+install -m 644 %{SOURCE2} 
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kernel-%name
+
+%post
+%{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD}
+%{fillup_only -an kernel}
+%{insserv_force_if_yast /etc/init.d/boot.loadmodules}
+case $NO_KMS_IN_INITRD in
+   no)
+   sed -i -e s@^KMS_IN_INITRD=@KMS_IN_INITRD=\yes\@ 
/etc/sysconfig/kernel ;;
+   yes)
+   sed -i -e s@^KMS_IN_INITRD=@KMS_IN_INITRD=\no\@ 
/etc/sysconfig/kernel ;;
+esac
 
 %posttrans
 /sbin/mkinitrd_setup
@@ -119,6 +139,7 @@
 %dir /lib/mkinitrd/boot
 %dir /lib/mkinitrd/setup
 %config /etc/rpm/macros.mkinitrd
+/etc/init.d/boot.loadmodules
 /lib/mkinitrd/scripts/*.sh
 /lib/mkinitrd/bin/*
 /bin/lsinitrd
@@ -126,6 +147,7 @@
 /sbin/mkinitrd_setup
 /sbin/module_upgrade
 /sbin/installkernel
+/var/adm/fillup-templates/sysconfig.kernel-%name
 %doc %{_mandir}/man5/mkinitrd.5.gz
 %doc %{_mandir}/man8/mkinitrd.8.gz
 %doc %{_mandir}/man8/lsinitrd.8.gz

++ boot.loadmodules ++
#! /bin/sh
#
# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. All rights reserved.
#
# File: /etc/init.d/boot.loadmodules
# Author: Jiri Srain jsr...@suse.cz
#
### BEGIN INIT INFO
# Provides:  boot.loadmodules
# Required-Start:boot.udev
# Required-Stop: boot.udev
# Default-Start: B
# Default-Stop:
# Short-Description: load modules required to be loaded in specific order
# Description:   load modules required to be loaded in specific order
### END INIT INFO

. /etc/rc.status

rc_reset

case $1 in
  start|restart)
# Read variable for sysconfig and load all mentioned modules
echo Loading required kernel modules
. /etc/sysconfig/kernel
for I in $MODULES_LOADED_ON_BOOT ; do
if ! modprobe -n $I  /dev/null 21 ; then continue ; fi
modprobe $I;
done
rc_status -v1 -r
   ;;
  stop)
# skip / nothing to do
;;
  status)
echo -n Checking if boot.loadmodules has run
rc_reset
for I in $MODULES_LOADED_ON_BOOT ; do
lsmod | grep -q ^$I  || rc_failed 3
done
rc_status -v
;;
  *)
echo Usage: $0 {start|stop|status|restart}
exit 1
;;
esac

rc_exit

++ mkinitrd-kms_reverse.patch ++
--- scripts/setup-kms.sh
+++ scripts/setup-kms.sh
@@ -250,7 +250,7 @@
 
 ## end of functions ##
 
-if [ $NO_KMS_IN_INITRD != yes ]  pciids_on_system
+if [ $KMS_IN_INITRD != no ]  pciids_on_system
 then
 
 gfx_modules=$(class_drivers $kernel_version $supported_classes)
++ sysconfig.kernel-mkinitrd ++
## Path:System/Kernel
## Description:
## Type:string
## Command: /sbin/mkinitrd
#
# This variable contains the list of modules to be added to the initial
# ramdisk by calling the script mkinitrd
# (like drivers for scsi-controllers, for lvm or reiserfs)
#

commit mkinitrd for openSUSE:Factory

2011-04-21 Thread h_root

Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Thu Apr 21 13:40:27 CEST 2011.




--- mkinitrd/mkinitrd.changes   2010-11-24 16:00:10.0 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes  2011-03-29 
23:42:08.0 +0200
@@ -1,0 +2,21 @@
+Tue Mar 29 21:37:28 UTC 2011 - mma...@novell.com
+
+- Change from /dev/.run to /run (bnc#678270#c2).
+
+---
+Mon Mar 14 21:38:37 UTC 2011 - mma...@novell.com
+
+- Create /dev/.run tmpfs mountpoint (bnc#678270).
+- version 2.7.0.
+
+---
+Fri Dec 17 14:40:56 UTC 2010 - mma...@novell.com
+
+- Survive dangling symlinks in /lib/mkinitrd/setup.
+
+---
+Fri Dec 17 14:20:15 UTC 2010 - mma...@novell.com
+
+- Really check mtime when determining whether to run mkinitrd_setup.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ mkinitrd.spec ++
--- /var/tmp/diff_new_pack.jdwLIT/_old  2011-04-21 13:40:03.0 +0200
+++ /var/tmp/diff_new_pack.jdwLIT/_new  2011-04-21 13:40:03.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package mkinitrd (Version 2.6.0)
+# spec file for package mkinitrd
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,8 +30,8 @@
 Requires:   sysvinit
 %endif
 AutoReqProv:on
-Version:2.6.0
-Release:6
+Version:2.7.0
+Release:1
 Conflicts:  udev  118
 Requires:   dhcpcd
 Summary:Creates an Initial RAM Disk Image for Preloading Modules

++ mkinitrd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.6.0/mkinitrd.changes 
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.6.0/mkinitrd.changes 2010-11-24 15:58:30.0 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-03-29 23:38:07.0 +0200
@@ -1,4 +1,25 @@
 ---
+Tue Mar 29 21:37:28 UTC 2011 - mma...@novell.com
+
+- Change from /dev/.run to /run (bnc#678270#c2).
+
+---
+Mon Mar 14 21:38:37 UTC 2011 - mma...@novell.com
+
+- Create /dev/.run tmpfs mountpoint (bnc#678270).
+- version 2.7.0.
+
+---
+Fri Dec 17 14:40:56 UTC 2010 - mma...@novell.com
+
+- Survive dangling symlinks in /lib/mkinitrd/setup.
+
+---
+Fri Dec 17 14:20:15 UTC 2010 - mma...@novell.com
+
+- Really check mtime when determining whether to run mkinitrd_setup.
+
+---
 Wed Nov 24 15:55:31 CET 2010 - p...@suse.de
 
 - Fix for new coreutils (bnc#654364).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.6.0/sbin/mkinitrd 
new/mkinitrd-2.7.0/sbin/mkinitrd
--- old/mkinitrd-2.6.0/sbin/mkinitrd2010-11-24 15:58:30.0 +0100
+++ new/mkinitrd-2.7.0/sbin/mkinitrd2011-03-29 23:38:07.0 +0200
@@ -25,7 +25,7 @@
 # git://git.opensuse.org/projects/mkinitrd.git
 #
 
-VERSION=2.6.0
+VERSION=2.7.0
 LOGDIR=/var/log/YaST2
 LOGFILE=$LOGDIR/mkinitrd.log
 declare -a cmd_option
@@ -471,11 +471,13 @@
 
 for setupfile in $INITRD_PATH/setup/*.sh; do
 [ -d $tmp_mnt ]  cd $tmp_mnt # process setup files in 
the initrd root dir
-if [ ! -d $setupfile ]; then
+if [ -f $setupfile ]; then
 curscript=${setupfile##*-}
 #   echo [$curscript] $blockdev
 source $setupfile
 [ $? -ne 0 ]  oops 1 Script $setupfile failed!
+else
+echo warning: skipping non-regular file $setupfile
 fi
 done
 cd $oldpwd
@@ -494,9 +496,9 @@
 initrd_images=( $initrd_images )
 kernel_images=( $kernel_images )
 
-scripts_mtime=$( stat -c %X $INITRD_PATH/scripts )
-setup_mtime=$( stat -c %X $INITRD_PATH/setup )
-boot_mtime=$( stat -c %X $INITRD_PATH/boot )
+scripts_mtime=$( stat -c %Y $INITRD_PATH/scripts )
+setup_mtime=$( stat -c %Y $INITRD_PATH/setup )
+boot_mtime=$( stat -c %Y $INITRD_PATH/boot )
 scripts_mtime=${scripts_mtime%.*}
 setup_mtime=${setup_mtime%.*}
 boot_mtime=${boot_mtime%.*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore'