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.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes      2011-08-01 
17:18:46.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug  1 15:09:15 UTC 2011 - [email protected]
+
+- 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.000000000 +0200
+++ /var/tmp/diff_new_pack.RLeiS1/_new  2011-08-02 08:55:44.000000000 +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.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-01 17:10:21.000000000 +0200
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Aug  1 15:09:15 UTC 2011 - [email protected]
+
+- Only copy /usr/bin/on_ac_power if it exists (bnc#708326).
+
+-------------------------------------------------------------------
 Fri Jul 29 13:46:54 UTC 2011 - [email protected]
 
 - 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.sh    2011-07-29 15:47:20.000000000 
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-mount.sh    2011-08-01 17:10:21.000000000 
+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.000000000 
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-mount.sh   2011-08-01 17:10:21.000000000 
+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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to