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.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-06-14
15:57:35.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.lXxO4s/_new 2011-06-14 16:57:30.000000000 +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.000000000
+0100
+++ new/mkinitrd-2.7.0/etc/boot.loadmodules 2011-06-14 15:56:40.000000000
+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 2>&1 ; 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-mkinitrd 1970-01-01
01:00:00.000000000 +0100
+++ new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd 2011-06-14
15:56:40.000000000 +0200
@@ -0,0 +1,64 @@
+## 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)
+#
+INITRD_MODULES=""
+
+## Type: string(yes)
+## Command: /sbin/mkinitrd
+## Default: ""
+#
+#
+# This variable disables the initialization of KMS in the initrd
+# by not including the modules required for KMS even though KMS is
+# supported on the underlying hardware.
+# After changing run mkinitrd again.
+#
+KMS_IN_INITRD="yes"
+
+## Type: string
+## Command: /sbin/mkinitrd
+#
+# This variable contains the list of modules to be added to the initial
+# ramdisk that is created for unprivilegd Xen domains (domU); you may need
+# drivers for virtual block and network devices in addition to filesystem
+# and device-mapper modules.
+#
+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: ""
+#
+# The file name of a binary ACPI Differentiated System Description Table
+# (DSDT). This table is appended to the initial ram disk (initrd) that
+# the mkinitrd script creates. If the kernel finds that its initrd
+# contains a DSDT, this table replaces the DSDT of the bios. If the file
+# specified in ACPI_DSDT is not found or ACPI_DSDT is empty/not specified,
+# no DSDT will be appended to the initrd.
+# Example path /etc/acpi/DSDT.aml
+# You can also override Secondary System Description Tables (SSDTs).
+# Add DSDT and SSDT files separated by spaces, e.g. "DSDT.aml SSDT1.aml"
+# The files must be named DSDT.aml and/or SSDT[1-9]*.aml.
+# For compatiblity reasons, if only one file is added it is assumed it is
+# the DSDT and will be used as such, in future the above naming scheme
+# will be enforce.
+# Be aware that overriding these tables can harm your system.
+# Only do this if you know what you are doing and file a bug on
+# bugzilla.kernel.org so that the root cause of the issue will get fixed.
+ACPI_DSDT=""
+
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-05-04 16:52:07.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-06-14 15:56:40.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+Mon May 9 16:55:56 CEST 2011 - r...@suse.de
+
+- move sysconfig/kernel related parts to this package
+
+-------------------------------------------------------------------
Wed May 4 14:42:49 UTC 2011 - mma...@novell.com
- Do not hardcode the xenblk driver, use the xen:vbd alias instead
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.spec 2011-05-04 16:52:07.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.spec 2011-06-14 15:56:40.000000000 +0200
@@ -34,9 +34,14 @@
Release: 3
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
+# 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
@@ -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 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}
+%{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
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.sh 2011-05-04 16:52:07.000000000
+0200
+++ new/mkinitrd-2.7.0/scripts/boot-start.sh 2011-06-14 15:56:40.000000000
+0200
@@ -51,7 +51,7 @@
mkdir -m 1777 /dev/shm
mount -t tmpfs -o mode=1777 tmpfs /dev/shm
mkdir /run
-mount -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /run
+mount -t tmpfs -o mode=0755,nodev,nosuid tmpfs /run
mkdir -m 0755 /dev/pts
mount -t devpts -o mode=0620,gid=5 devpts /dev/pts
ln -s /proc/self/fd /dev/fd
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-05-04 16:52:07.000000000
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-kms.sh 2011-06-14 15:56:40.000000000
+0200
@@ -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)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
