Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2013-08-04 07:28:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2013-07-22
12:58:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2013-08-04
07:28:59.000000000 +0200
@@ -1,0 +2,16 @@
+Sat Aug 3 07:10:55 UTC 2013 - tittiatc...@gmail.com
+
+- Drop the buildrequire for the microcode_ctl. This package
+ is no longer in Factory and with the latest kernel (3.11)
+ no longer required.
+
+-------------------------------------------------------------------
+Sun Jul 28 00:39:55 UTC 2013 - crrodrig...@opensuse.org
+
+- version 030_git201307241235
+* systemd: Replace prefdm.service with display-manager.service
+* modsign: do not install, if no keys present
+* bcache: add support for bcache
+* Use systemd-cat for logging on systemd systems, if logfile is empty
+
+-------------------------------------------------------------------
Old:
----
dracut-029_git201307171236.tar.xz
New:
----
dracut-030_git201307241235.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.PW3Nu1/_old 2013-08-04 07:29:00.000000000 +0200
+++ /var/tmp/diff_new_pack.PW3Nu1/_new 2013-08-04 07:29:00.000000000 +0200
@@ -21,7 +21,7 @@
%define replace_mkinitrd 0
Name: dracut
-Version: 029_git201307171236
+Version: 030_git201307241235
Release: 0
Summary: Initramfs generator using udev
@@ -74,9 +74,6 @@
Requires: xz
Recommends: binutils
Requires: pigz
-%ifarch %ix86 x86_64
-Requires: microcode_ctl
-%endif
%{?systemd_requires}
%description
@@ -177,8 +174,6 @@
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut
-find %buildroot -type f -name "*.service" -exec sed -i -e
's@prefdm.service@display-manager.service@g' {} +
-
%clean
rm -rf %{buildroot}
@@ -282,6 +277,12 @@
%{dracutlibdir}/modules.d/99img-lib
%{dracutlibdir}/modules.d/99shutdown
%{dracutlibdir}/modules.d/99suse
+%dir %{dracutlibdir}/modules.d/03modsign
+%{dracutlibdir}/modules.d/03modsign/load-modsign-keys.sh
+%{dracutlibdir}/modules.d/03modsign/module-setup.sh
+%dir %{dracutlibdir}/modules.d/90bcache
+%{dracutlibdir}/modules.d/90bcache/module-setup.sh
+
%config(noreplace) %{_sysconfdir}/logrotate.d/dracut
%attr(0644,root,root) %ghost %config(missingok,noreplace)
%{_localstatedir}/log/dracut.log
%if %{defined _unitdir}
++++++ correct-paths-for-opensuse.patch ++++++
--- /var/tmp/diff_new_pack.PW3Nu1/_old 2013-08-04 07:29:00.000000000 +0200
+++ /var/tmp/diff_new_pack.PW3Nu1/_new 2013-08-04 07:29:00.000000000 +0200
@@ -1,5 +1,5 @@
---- dracut-029_git201307171236.orig/dracut.sh
-+++ dracut-029_git201307171236/dracut.sh
+--- dracut-030_git201307241235.orig/dracut.sh
++++ dracut-030_git201307241235/dracut.sh
@@ -643,7 +643,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
@@ -9,8 +9,8 @@
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $compress_l ]] && compress=$compress_l
---- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh
-+++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh
+--- dracut-030_git201307241235.orig/modules.d/10i18n/module-setup.sh
++++ dracut-030_git201307241235/modules.d/10i18n/module-setup.sh
@@ -94,6 +94,8 @@ install() {
install_base() {
@@ -20,8 +20,8 @@
if ! dracut_module_included "systemd"; then
inst ${moddir}/console_init.sh /lib/udev/console_init
---- dracut-029_git201307171236.orig/modules.d/50plymouth/module-setup.sh
-+++ dracut-029_git201307171236/modules.d/50plymouth/module-setup.sh
+--- dracut-030_git201307241235.orig/modules.d/50plymouth/module-setup.sh
++++ dracut-030_git201307241235/modules.d/50plymouth/module-setup.sh
@@ -12,12 +12,12 @@ depends() {
}
@@ -38,9 +38,9 @@
fi
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
---- dracut-029_git201307171236.orig/modules.d/90kernel-modules/module-setup.sh
-+++ dracut-029_git201307171236/modules.d/90kernel-modules/module-setup.sh
-@@ -74,7 +74,7 @@ installkernel() {
+--- dracut-030_git201307241235.orig/modules.d/90kernel-modules/module-setup.sh
++++ dracut-030_git201307241235/modules.d/90kernel-modules/module-setup.sh
+@@ -75,7 +75,7 @@ installkernel() {
}
install() {
@@ -49,8 +49,8 @@
[[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf
/etc/modprobe.conf
if ! dracut_module_included "systemd"; then
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
---- dracut-029_git201307171236.orig/modules.d/95udev-rules/module-setup.sh
-+++ dracut-029_git201307171236/modules.d/95udev-rules/module-setup.sh
+--- dracut-030_git201307241235.orig/modules.d/95udev-rules/module-setup.sh
++++ dracut-030_git201307241235/modules.d/95udev-rules/module-setup.sh
@@ -11,6 +11,8 @@ install() {
dracut_install udevadm cat uname blkid \
/etc/udev/udev.conf
@@ -60,8 +60,8 @@
[ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
[ -x "$_i" ] || continue
---- dracut-029_git201307171236.orig/modules.d/98systemd/rescue.service
-+++ dracut-029_git201307171236/modules.d/98systemd/rescue.service
+--- dracut-030_git201307241235.orig/modules.d/98systemd/rescue.service
++++ dracut-030_git201307241235/modules.d/98systemd/rescue.service
@@ -16,7 +16,7 @@ Environment=HOME=/
Environment=DRACUT_SYSTEMD=1
Environment=NEWROOT=/sysroot
++++++ dracut-029_git201307171236.tar.xz -> dracut-030_git201307241235.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/AUTHORS
new/dracut-030_git201307241235/AUTHORS
--- old/dracut-029_git201307171236/AUTHORS 2013-07-17 14:36:34.000000000
+0200
+++ new/dracut-030_git201307241235/AUTHORS 2013-07-24 14:35:19.000000000
+0200
@@ -1,9 +1,9 @@
Harald Hoyer <har...@redhat.com>
Victor Lowther <victor.lowt...@gmail.com>
Amadeusz Żołnowski <aide...@aidecoe.name>
+Will Woods <wwo...@redhat.com>
Philippe Seewer <philippe.see...@bfh.ch>
Warren Togami <wtog...@redhat.com>
-Will Woods <wwo...@redhat.com>
Jeremy Katz <ka...@redhat.com>
David Dillow <d...@thedillows.org>
Dave Young <dyo...@redhat.com>
@@ -18,8 +18,11 @@
Luca Berra <bl...@vodka.it>
Daniel Drake <d...@laptop.org>
Dan Horák <dho...@redhat.com>
+WANG Chao <chaow...@redhat.com>
Leho Kraav <l...@kraav.com>
+Baoquan He <b...@redhat.com>
Brian C. Lane <b...@redhat.com>
+Kamil Rytarowski <n...@gmx.com>
Marc Grimme <gri...@atix.de>
Chao Wang <chaow...@redhat.com>
Frederic Crozat <fcro...@suse.com>
@@ -29,6 +32,7 @@
Anton Blanchard <an...@samba.org>
Bill Nottingham <nott...@redhat.com>
David Cantrell <dcantr...@redhat.com>
+Dennis Gilmore <den...@ausil.us>
Jon Ander Hernandez <jona...@gmail.com>
Juan RP <xtra...@gmail.com>
Lance Albertson <la...@osuosl.org>
@@ -36,23 +40,22 @@
Michael Ploujnikov <pl...@somanetworks.com>
Peter Rajnoha <prajn...@redhat.com>
Radek Vykydal <rvyky...@redhat.com>
-WANG Chao <chaow...@redhat.com>
Wim Muskee <wimmus...@gmail.com>
Alan Jenkins <alan-jenk...@tuffmail.co.uk>
Alan Pevec <ape...@redhat.com>
-Baoquan He <b...@redhat.com>
Colin Walters <walt...@verbum.org>
-Dennis Gilmore <den...@ausil.us>
Frederick Grose <fgr...@sugarlabs.org>
Ian Dall <i...@beware.dropbear.id.au>
James Buren <r...@frugalware.org>
Joey Boggs <jbo...@redhat.com>
+Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Mike Snitzer <snit...@redhat.com>
Przemysław Rudy <pru...@o2.pl>
Stefan Reimer <i...@startux.de>
Thomas Lange <la...@informatik.uni-koeln.de>
Vivek Goyal <vgo...@redhat.com>
Vladislav Bogdanov <bub...@hoster-ok.com>
+Adam Williamson <awill...@redhat.com>
Alexander Todorov <atodo...@redhat.com>
Andy Lutomirski <l...@mit.edu>
Anssi Hannula <an...@mageia.org>
@@ -62,6 +65,7 @@
Cong Wang <amw...@redhat.com>
Dave Jones <da...@redhat.com>
Dave Young <d...@redhat.com>
+Dennis Schridde <devuran...@gmx.net>
Duane Griffin <dua...@dghda.com>
Glen Gray <sla...@slaine.org>
Hermann Gausterer <git-dracut-2...@mrq1.org>
@@ -70,7 +74,6 @@
Jiri Pirko <j...@resnulli.us>
Joe Lawrence <joe.lawre...@stratus.com>
Kevin Yung <kevin.y...@myob.com>
-Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Lars R. Damerow <l...@pixar.com>
Lennert Buytenhek <buyt...@wantstofly.org>
Lubomir Rintel <lkund...@v3.sk>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/NEWS
new/dracut-030_git201307241235/NEWS
--- old/dracut-029_git201307171236/NEWS 2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/NEWS 2013-07-24 14:35:19.000000000 +0200
@@ -1,3 +1,19 @@
+dracut-030
+==========
+- support new persistent network interface names
+- fix findmnt calls, prevents hang on stale NFS mounts
+- add systemd.slice and slice.target units
+- major shell cleanup
+- support root=PARTLABEL= and root=PARTUUID=
+- terminfo: only install l/linux v/vt100 and v/vt220
+- unset all LC_* and LANG, 10% faster
+- fixed dependency loop for dracut-cmdline.service
+- do not wait_for_dev for the root devices
+- do not wait_for_dev for devices, if dracut-initqueue is not needed
+- support early microcode loading with --early-microcode
+- dmraid, let dmraid setup its own partitions
+- sosreport renamed to rdsosreport
+
dracut-029
==========
- wait for IPv6 autoconfiguration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/dracut-functions.sh
new/dracut-030_git201307241235/dracut-functions.sh
--- old/dracut-029_git201307171236/dracut-functions.sh 2013-07-17
14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/dracut-functions.sh 2013-07-24
14:35:19.000000000 +0200
@@ -288,7 +288,6 @@
printf "%s" "$ID_FS_TYPE"
return 0
fi
- return 1
fi
# Fallback, if we don't have udev information
@@ -1255,7 +1254,6 @@
[[ $2 ]] || mods_checked_as_dep+=" $_mod "
if [[ " $omit_dracutmodules " == *\ $_mod\ * ]]; then
- dinfo "dracut module '$_mod' will not be installed, because it's in
the list to be omitted!"
return 1
fi
@@ -1456,6 +1454,7 @@
dracut_kernel_post() {
local _moddirname=${srcmods%%/lib/modules/*}
+ local _pid
if [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && [[ -f
"$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" ]]; then
xargs -r modprobe -a ${_moddirname+-d ${_moddirname}/} \
@@ -1479,6 +1478,7 @@
done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
fi
) &
+ while read a ; do _pid=$a;done < <(jobs -p)
if [[ $DRACUT_INSTALL ]]; then
xargs -r modinfo -k $kernel -F firmware <
"$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep" \
@@ -1498,7 +1498,7 @@
done
fi
- wait
+ wait $_pid
fi
for _f in modules.builtin.bin modules.builtin; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/dracut-logger.sh
new/dracut-030_git201307241235/dracut-logger.sh
--- old/dracut-029_git201307171236/dracut-logger.sh 2013-07-17
14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/dracut-logger.sh 2013-07-24
14:35:19.000000000 +0200
@@ -117,30 +117,38 @@
if [ -z "$fileloglvl" ]; then
[ -w "$logfile" ] && fileloglvl=4 || fileloglvl=0
elif (( $fileloglvl > 0 )); then
- __oldumask=$(umask)
- umask 0377
- ! [ -e "$logfile" ] && >"$logfile"
- umask $__oldumask
- if [ -w "$logfile" -a -f "$logfile" ]; then
+ if [[ $logfile ]]; then
+ __oldumask=$(umask)
+ umask 0377
+ ! [ -e "$logfile" ] && >"$logfile"
+ umask $__oldumask
+ if [ -w "$logfile" -a -f "$logfile" ]; then
# Mark new run in the log file
- echo >>"$logfile"
- if command -v date >/dev/null; then
- echo "=== $(date) ===" >>"$logfile"
+ echo >>"$logfile"
+ if command -v date >/dev/null; then
+ echo "=== $(date) ===" >>"$logfile"
+ else
+ echo "==============================================="
>>"$logfile"
+ fi
+ echo >>"$logfile"
else
- echo "==============================================="
>>"$logfile"
- fi
- echo >>"$logfile"
- else
# We cannot log to file, so turn this facility off.
- fileloglvl=0
- ret=1
- errmsg="'$logfile' is not a writable file"
+ fileloglvl=0
+ ret=1
+ errmsg="'$logfile' is not a writable file"
+ fi
fi
fi
if (( $sysloglvl > 0 )); then
- if ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger >/dev/null
- then
+ if type -P systemd-cat &>/dev/null && (( $UID == 0 )) ; then
+ readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t
dracut-log.XXXXXX)"
+ readonly _systemdcatfile="$_dlogdir/systemd-cat"
+ mkfifo "$_systemdcatfile"
+ readonly _dlogfd=15
+ systemd-cat -t 'dracut' <"$_systemdcatfile" &
+ exec 15>"$_systemdcatfile"
+ elif ! [ -S /dev/log -a -w /dev/log ] || ! command -v logger
>/dev/null; then
# We cannot log to syslog, so turn this facility off.
sysloglvl=0
ret=1
@@ -306,15 +314,23 @@
_do_dlog() {
local lvl="$1"; shift
local lvlc=$(_lvl2char "$lvl") || return 0
- local msg="$lvlc: $*"
+ local msg="$*"
+ local lmsg="$lvlc: $*"
(( $lvl <= $stdloglvl )) && echo "$msg" >&2
+
if (( $lvl <= $sysloglvl )); then
- logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
+ if [[ "$_dlogfd" ]]; then
+ echo "<$(_dlvl2syslvl $lvl)>$msg" >&$_dlogfd
+ else
+ logger -t "dracut[$$]" -p $(_lvl2syspri $lvl) "$msg"
+ fi
fi
+
if (( $lvl <= $fileloglvl )) && [[ -w "$logfile" ]] && [[ -f "$logfile"
]]; then
- echo "$msg" >>"$logfile"
+ echo "$lmsg" >>"$logfile"
fi
+
(( $lvl <= $kmsgloglvl )) && \
echo "<$(_dlvl2syslvl $lvl)>dracut[$$] $msg" >/dev/kmsg
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/dracut.conf.d/fedora.conf.example
new/dracut-030_git201307241235/dracut.conf.d/fedora.conf.example
--- old/dracut-029_git201307171236/dracut.conf.d/fedora.conf.example
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/dracut.conf.d/fedora.conf.example
2013-07-24 14:35:19.000000000 +0200
@@ -5,8 +5,7 @@
i18n_default_font="latarcyrheb-sun16"
omit_drivers+=' .*/fs/ocfs/.* i2o_scsi'
stdloglvl=3
-logfile=/var/log/dracut.log
-fileloglvl=6
+sysloglvl=5
install_items+=" vi /etc/virc ps grep cat rm "
prefix="/"
systemdutildir=/usr/lib/systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/dracut.sh
new/dracut-030_git201307241235/dracut.sh
--- old/dracut-029_git201307171236/dracut.sh 2013-07-17 14:36:34.000000000
+0200
+++ new/dracut-030_git201307241235/dracut.sh 2013-07-24 14:35:19.000000000
+0200
@@ -683,7 +683,15 @@
}
fi
# clean up after ourselves no matter how we die.
-trap 'ret=$?;[[ $outfile ]] && [[ -f $outfile.$$ ]] && rm -f --
"$outfile.$$";[[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir
]] && rm -rf -- "$initdir"; [[ $microcode_dir ]] && rm -Rf -- "$microcode_dir";
exit $ret; };' EXIT
+trap '
+ ret=$?;
+ [[ $outfile ]] && [[ -f $outfile.$$ ]] && rm -f -- "$outfile.$$";
+ [[ $keep ]] && echo "Not removing $initdir." >&2 || { [[ $initdir ]] && rm
-rf -- "$initdir"; };
+ [[ $keep ]] && echo "Not removing $microcode_dir." >&2 || { [[
$microcode_dir ]] && rm -Rf -- "$microcode_dir"; };
+ [[ $_dlogdir ]] && rm -Rf -- "$_dlogdir";
+ exit $ret;
+ ' EXIT
+
# clean up after ourselves no matter how we die.
trap 'exit 1;' SIGINT
@@ -761,7 +769,7 @@
dracut_args[$i]="\"${dracut_args[$i]}\""
#" keep vim happy
done
-ddebug "Executing: $0 ${dracut_args[@]}"
+dinfo "Executing: $0 ${dracut_args[@]}"
[[ $do_list = yes ]] && {
for mod in $dracutbasedir/modules.d/*; do
@@ -855,13 +863,13 @@
for mp in \
"/" \
"/etc" \
- "/usr" \
- "/usr/bin" \
- "/usr/sbin" \
- "/usr/lib" \
- "/usr/lib64" \
+ "/bin" \
+ "/sbin" \
+ "/lib" \
+ "/lib64" \
"/boot";
do
+ mp=$(readlink -f "$mp")
mountpoint "$mp" >/dev/null 2>&1 || continue
_dev="$(readlink -f "/dev/block/$(find_block_device "$mp")")"
[[ "$_mp" == "/" ]] && root_dev="$_dev"
@@ -1167,11 +1175,6 @@
fi
fi
-if (( maxloglvl >= 5 )); then
- ddebug "Listing sizes of included files:"
- du -c "$initdir" | sort -n | ddebug
-fi
-
PRELINK_BIN="$(command -v prelink)"
if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then
if [[ $DRACUT_FIPS_MODE ]]; then
@@ -1258,6 +1261,7 @@
done
(cd "$microcode_dir/d"; find . | cpio -o -H newc --quiet >../ucode.cpio)
fi
+
rm -f -- "$outfile"
dinfo "*** Creating image file ***"
if [[ $early_microcode = yes ]]; then
@@ -1272,7 +1276,8 @@
mv -- "$outfile.$$" "$outfile"
dinfo "*** Creating image file done ***"
-dinfo "Wrote $outfile:"
-dinfo "$(ls -l "$outfile")"
+if (( maxloglvl >= 5 )); then
+ lsinitrd "$outfile"| ddebug
+fi
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/dracut.spec
new/dracut-030_git201307241235/dracut.spec
--- old/dracut-029_git201307171236/dracut.spec 2013-07-17 14:36:34.000000000
+0200
+++ new/dracut-030_git201307241235/dracut.spec 2013-07-24 14:35:19.000000000
+0200
@@ -95,6 +95,7 @@
%if 0%{?fedora} || 0%{?rhel} > 6
Requires: util-linux >= 2.21
Requires: systemd >= 199
+Requires: procps-ng
Conflicts: grubby < 8.23
%else
Requires: udev > 166
@@ -269,9 +270,6 @@
echo 'dracut_rescue_image="yes"' >
$RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
%endif
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m 0644 dracut.logrotate
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/dracut_log
-
# create compat symlink
mkdir -p $RPM_BUILD_ROOT/sbin
ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
@@ -367,7 +365,6 @@
%{dracutlibdir}/modules.d/99fs-lib
%{dracutlibdir}/modules.d/99img-lib
%{dracutlibdir}/modules.d/99shutdown
-%config(noreplace) %{_sysconfdir}/logrotate.d/dracut_log
%attr(0644,root,root) %ghost %config(missingok,noreplace)
%{_localstatedir}/log/dracut.log
%dir %{_sharedstatedir}/initramfs
%if %{defined _unitdir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/03modsign/load-modsign-keys.sh
new/dracut-030_git201307241235/modules.d/03modsign/load-modsign-keys.sh
--- old/dracut-029_git201307171236/modules.d/03modsign/load-modsign-keys.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/dracut-030_git201307241235/modules.d/03modsign/load-modsign-keys.sh
2013-07-24 14:35:19.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjo...@redhat.com>
+
+for x in /lib/modules/keys/* ; do
+ [ "${x}" = "/lib/modules/keys/*" ] && break
+ keyctl padd asymmetric "" @s < ${x}
+done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/03modsign/module-setup.sh
new/dracut-030_git201307241235/modules.d/03modsign/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/03modsign/module-setup.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/dracut-030_git201307241235/modules.d/03modsign/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -0,0 +1,37 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+#
+# Licensed under the GPLv2
+#
+# Copyright 2013 Red Hat, Inc.
+# Peter Jones <pjo...@redhat.com>
+
+check() {
+ [[ -x /usr/bin/keyctl ]] || return 1
+
+ # do not include module in hostonly mode,
+ # if no keys are present
+ if [[ $hostonly ]]; then
+ x=$(echo /lib/modules/keys/*)
+ [[ "${x}" = "/lib/modules/keys/*" ]] && return 255
+ fi
+
+ return 0
+}
+
+depends() {
+ return 0
+}
+
+install() {
+ inst_dir /lib/modules/keys
+ inst_binary /usr/bin/keyctl
+
+ inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh"
+
+ for x in /lib/modules/keys/* ; do
+ [[ "${x}" = "/lib/modules/keys/*" ]] && break
+ inst_simple "${x}"
+ done
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/90bcache/module-setup.sh
new/dracut-030_git201307241235/modules.d/90bcache/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/90bcache/module-setup.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/dracut-030_git201307241235/modules.d/90bcache/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -0,0 +1,30 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+ type -P probe-bcache >/dev/null || return 1
+
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
+ for fs in "${host_fs_types[@]}"; do
+ [[ $fs = "bcache" ]] && return 0
+ done
+ return 255
+ }
+
+ return 0
+}
+
+depends() {
+ return 0
+}
+
+installkernel() {
+ instmods bcache
+}
+
+install() {
+ dracut_install probe-bcache ${udevdir}/bcache-register
+ inst_rules 61-bcache.rules
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/90dm/module-setup.sh
new/dracut-030_git201307241235/modules.d/90dm/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/90dm/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/90dm/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -29,6 +29,8 @@
# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
# files, but provides the one below:
inst_rules 64-device-mapper.rules
+ # debian udev rules
+ inst_rules 60-persistent-storage-dm.rules 55-dm.rules
inst_rules "$moddir/11-dm.rules"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/90kernel-modules/module-setup.sh
new/dracut-030_git201307241235/modules.d/90kernel-modules/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/90kernel-modules/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/90kernel-modules/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -47,7 +47,8 @@
if [[ "$(uname -p)" == arm* ]]; then
# arm specific modules
hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap
omapdrm \
- omap_hsmmc panel-tfp410 sdhci_dove ahci_platform pata_imx
sata_mv
+ omap_hsmmc panel-tfp410 sdhci_dove ahci_platform pata_imx
sata_mv \
+ ehci-tegra
fi
# install virtual machine support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/90lvm/module-setup.sh
new/dracut-030_git201307241235/modules.d/90lvm/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/90lvm/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/90lvm/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -65,6 +65,8 @@
# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
# files, but provides the one below:
inst_rules 64-device-mapper.rules
+ # debian udev rules
+ inst_rules 56-lvm.rules 60-persistent-storage-lvm.rules
inst_script "$moddir/lvm_scan.sh" /sbin/lvm_scan
inst_hook cmdline 30 "$moddir/parse-lvm.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/95resume/module-setup.sh
new/dracut-030_git201307241235/modules.d/95resume/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/95resume/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/95resume/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -2,6 +2,18 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
+check() {
+ # No point trying to support resume, if no swap partition exist
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
+ for fs in "${host_fs_types[@]}"; do
+ [[ $fs = swap ]] && return 0
+ done
+ return 255
+ }
+
+ return 0
+}
+
install() {
local _bin
# Optional uswsusp support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/95rootfs-block/module-setup.sh
new/dracut-030_git201307241235/modules.d/95rootfs-block/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/95rootfs-block/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/95rootfs-block/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -31,6 +31,7 @@
install() {
dracut_install umount
+ dracut_install tr
if ! dracut_module_included "systemd"; then
inst_hook cmdline 95 "$moddir/parse-block.sh"
inst_hook pre-udev 30 "$moddir/block-genrules.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/95rootfs-block/parse-block.sh
new/dracut-030_git201307241235/modules.d/95rootfs-block/parse-block.sh
--- old/dracut-029_git201307171236/modules.d/95rootfs-block/parse-block.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/95rootfs-block/parse-block.sh
2013-07-24 14:35:19.000000000 +0200
@@ -10,11 +10,15 @@
rootok=1 ;;
block:UUID=*|UUID=*)
root="${root#block:}"
+ root="${root#UUID=}"
+ root="$(echo $root | tr "[:upper:]" "[:lower:]")"
root="block:/dev/disk/by-uuid/${root#UUID=}"
rootok=1 ;;
block:PARTUUID=*|PARTUUID=*)
root="${root#block:}"
- root="block:/dev/disk/by-partuuid/${root#PARTUUID=}"
+ root="${root#PARTUUID=}"
+ root="$(echo $root | tr "[:upper:]" "[:lower:]")"
+ root="block:/dev/disk/by-partuuid/${root}"
rootok=1 ;;
block:PARTLABEL=*|PARTLABEL=*)
root="${root#block:}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/95udev-rules/module-setup.sh
new/dracut-030_git201307241235/modules.d/95udev-rules/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/95udev-rules/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/95udev-rules/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -36,6 +36,8 @@
"$moddir/61-persistent-storage.rules"
prepare_udev_rules 59-persistent-storage.rules 61-persistent-storage.rules
+ # debian udev rules
+ inst_rules 91-permissions.rules
{
for i in cdrom tape dialout floppy; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/98systemd/dracut-shutdown.service
new/dracut-030_git201307241235/modules.d/98systemd/dracut-shutdown.service
--- old/dracut-029_git201307171236/modules.d/98systemd/dracut-shutdown.service
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/98systemd/dracut-shutdown.service
2013-07-24 14:35:19.000000000 +0200
@@ -8,7 +8,7 @@
[Unit]
Description=Restore /run/initramfs
Documentation=man:dracut-shutdown.service(8)
-After=getty@tty1.service prefdm.service
+After=getty@tty1.service display-manager.service
Before=systemd-reboot.service shutdown.target
DefaultDependencies=no
ConditionPathExists=/run/initramfs/.need_shutdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/98systemd/module-setup.sh
new/dracut-030_git201307241235/modules.d/98systemd/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/98systemd/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/98systemd/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -81,7 +81,6 @@
$systemdsystemunitdir/systemd-reboot.service \
$systemdsystemunitdir/systemd-kexec.service \
$systemdsystemunitdir/systemd-fsck@.service \
- $systemdsystemunitdir/systemd-fsck-root.service \
$systemdsystemunitdir/systemd-udevd.service \
$systemdsystemunitdir/systemd-udev-trigger.service \
$systemdsystemunitdir/systemd-udev-settle.service \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/98usrmount/module-setup.sh
new/dracut-030_git201307241235/modules.d/98usrmount/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/98usrmount/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/98usrmount/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -3,7 +3,10 @@
# ex: ts=8 sw=4 sts=4 et filetype=sh
check() {
+ local _init
[[ $mount_needs ]] && return 1
+ _init=$(readlink -f /sbin/init)
+ [[ "$init" == "${init##/usr}" ]] && return 255
return 0
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/99base/dracut-lib.sh
new/dracut-030_git201307241235/modules.d/99base/dracut-lib.sh
--- old/dracut-029_git201307171236/modules.d/99base/dracut-lib.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/99base/dracut-lib.sh
2013-07-24 14:35:19.000000000 +0200
@@ -927,6 +927,31 @@
rm -f -- /run/initramfs/loginit.pipe /run/initramfs/loginit.pid
}
+# pidof version for root
+if ! command -v pidof >/dev/null 2>/dev/null; then
+ pidof() {
+ local _cmd
+ local _exe
+ local _rl
+ local i
+ _cmd="$1"
+ [ -z "$_cmd" ] && return 1
+ _exe=$(type -P "$1")
+ for i in /proc/*/exe; do
+ [ -e "$i" ] || return 1
+ if [ -n "$_exe" ]; then
+ [ "$i" -ef "$_cmd" ] || continue
+ else
+ _rl=$(readlink -f "$i");
+ [ "${_rl%/$_cmd}" != "$_rl" ] || continue
+ fi
+ i=${i%/exe}
+ echo ${i##/proc/}
+ done
+ return 0
+ }
+fi
+
_emergency_shell()
{
local _name="$1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-029_git201307171236/modules.d/99base/init.sh
new/dracut-030_git201307241235/modules.d/99base/init.sh
--- old/dracut-029_git201307171236/modules.d/99base/init.sh 2013-07-17
14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/99base/init.sh 2013-07-24
14:35:19.000000000 +0200
@@ -278,8 +278,8 @@
udevadm control --stop-exec-queue
HARD=""
- while pidof systemd-udevd >/dev/null 2>&1; do
- for pid in $(pidof systemd-udevd); do
+ while pidof udevd >/dev/null 2>&1; do
+ for pid in $(pidof udevd); do
kill $HARD $pid >/dev/null 2>&1
done
HARD="-9"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-029_git201307171236/modules.d/99base/module-setup.sh
new/dracut-030_git201307241235/modules.d/99base/module-setup.sh
--- old/dracut-029_git201307171236/modules.d/99base/module-setup.sh
2013-07-17 14:36:34.000000000 +0200
+++ new/dracut-030_git201307241235/modules.d/99base/module-setup.sh
2013-07-24 14:35:19.000000000 +0200
@@ -13,7 +13,7 @@
install() {
local _d
- dracut_install mount mknod mkdir pidof sleep chroot \
+ dracut_install mount mknod mkdir sleep chroot \
sed ls flock cp mv dmesg rm ln rmmod mkfifo umount readlink setsid
inst $(command -v modprobe) /sbin/modprobe
++++++ use_all_paths_udev.patch ++++++
--- /var/tmp/diff_new_pack.PW3Nu1/_old 2013-08-04 07:29:00.000000000 +0200
+++ /var/tmp/diff_new_pack.PW3Nu1/_new 2013-08-04 07:29:00.000000000 +0200
@@ -1,6 +1,6 @@
---- dracut-029_git201307171236.orig/dracut-functions.sh
-+++ dracut-029_git201307171236/dracut-functions.sh
-@@ -955,7 +955,7 @@ inst_rules() {
+--- dracut-030_git201307241235.orig/dracut-functions.sh
++++ dracut-030_git201307241235/dracut-functions.sh
+@@ -954,7 +954,7 @@ inst_rules() {
inst_dir "$_target"
for _rule in "$@"; do
if [ "${_rule#/}" = "$_rule" ]; then
++++++ use_initrd_insteadof_initramfs.patch ++++++
--- /var/tmp/diff_new_pack.PW3Nu1/_old 2013-08-04 07:29:00.000000000 +0200
+++ /var/tmp/diff_new_pack.PW3Nu1/_new 2013-08-04 07:29:00.000000000 +0200
@@ -1,5 +1,5 @@
---- dracut-029_git201307171236.orig/dracut.8.asc
-+++ dracut-029_git201307171236/dracut.8.asc
+--- dracut-030_git201307241235.orig/dracut.8.asc
++++ dracut-030_git201307241235/dracut.8.asc
@@ -18,7 +18,7 @@ DESCRIPTION
Create an initramfs <image> for the kernel with the version <kernel version>.
If <kernel version> is omitted, then the version of the actual running
@@ -18,8 +18,8 @@
contains the kernel modules of the currently active kernel with version
_++<kernel version>++_.
---- dracut-029_git201307171236.orig/dracut.asc
-+++ dracut-029_git201307171236/dracut.asc
+--- dracut-030_git201307241235.orig/dracut.asc
++++ dracut-030_git201307241235/dracut.asc
@@ -153,7 +153,7 @@ To create a initramfs image, the most si
This will generate a general purpose initramfs image, with all possible
@@ -107,8 +107,8 @@
----
This will reduce the size of the initramfs image significantly.
---- dracut-029_git201307171236.orig/dracut-initramfs-restore.sh
-+++ dracut-029_git201307171236/dracut-initramfs-restore.sh
+--- dracut-030_git201307241235.orig/dracut-initramfs-restore.sh
++++ dracut-030_git201307241235/dracut-initramfs-restore.sh
@@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)"
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID}
]] ; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@@ -118,8 +118,8 @@
cd /run/initramfs
---- dracut-029_git201307171236.orig/dracut.sh
-+++ dracut-029_git201307171236/dracut.sh
+--- dracut-030_git201307241235.orig/dracut.sh
++++ dracut-030_git201307241235/dracut.sh
@@ -490,7 +490,7 @@ if ! [[ $outfile ]]; then
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L
/boot/${MACHINE_ID} ]] ); then
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
@@ -129,8 +129,8 @@
fi
fi
---- dracut-029_git201307171236.orig/mkinitrd-dracut.sh
-+++ dracut-029_git201307171236/mkinitrd-dracut.sh
+--- dracut-030_git201307241235.orig/mkinitrd-dracut.sh
++++ dracut-030_git201307241235/mkinitrd-dracut.sh
@@ -11,7 +11,7 @@ usage () {
$cmd " [--nocompress]"
$cmd " <initrd-image> <kernel-version>"
@@ -140,8 +140,8 @@
[[ $1 = '-n' ]] && exit 0
exit 1
---- dracut-029_git201307171236.orig/lsinitrd.1.asc
-+++ dracut-029_git201307171236/lsinitrd.1.asc
+--- dracut-030_git201307241235.orig/lsinitrd.1.asc
++++ dracut-030_git201307241235/lsinitrd.1.asc
@@ -18,7 +18,7 @@ DESCRIPTION
-----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
@@ -151,8 +151,8 @@
OPTIONS
-------
---- dracut-029_git201307171236.orig/lsinitrd.sh
-+++ dracut-029_git201307171236/lsinitrd.sh
+--- dracut-030_git201307241235.orig/lsinitrd.sh
++++ dracut-030_git201307241235/lsinitrd.sh
@@ -84,7 +84,7 @@ else
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@@ -162,8 +162,8 @@
fi
fi
---- dracut-029_git201307171236.orig/51-dracut-rescue-postinst.sh
-+++ dracut-029_git201307171236/51-dracut-rescue-postinst.sh
+--- dracut-030_git201307241235.orig/51-dracut-rescue-postinst.sh
++++ dracut-030_git201307241235/51-dracut-rescue-postinst.sh
@@ -18,7 +18,7 @@ fi
[[ $MACHINE_ID ]] || exit 1
[[ -f $KERNEL_IMAGE ]] || exit 1
++++++ use_sysconfig_values_correctly.patch ++++++
--- /var/tmp/diff_new_pack.PW3Nu1/_old 2013-08-04 07:29:00.000000000 +0200
+++ /var/tmp/diff_new_pack.PW3Nu1/_new 2013-08-04 07:29:00.000000000 +0200
@@ -1,5 +1,5 @@
---- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh
-+++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh
+--- dracut-030_git201307241235.orig/modules.d/10i18n/module-setup.sh
++++ dracut-030_git201307241235/modules.d/10i18n/module-setup.sh
@@ -155,6 +155,9 @@ install() {
# Gentoo user may have KEYMAP set to something like "-u pl2",
KEYMAP=${KEYMAP#-* }
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
