Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit mkinitrd
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 21 Apr 2006 16:33:46 +0200 (CEST)
  • Message-id: <20060421143346.71C248BEA5@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package mkinitrd
checked in at Fri Apr 21 16:33:46 CEST 2006.

--------
--- mkinitrd/mkinitrd.changes 2006-04-19 15:13:32.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2006-04-21 15:47:48.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Apr 21 15:45:45 CEST 2006 - olh@xxxxxxx
+
+- remove +s bits from mount to allow mkinitrd as unprivileged user
+
+-------------------------------------------------------------------
+Fri Apr 21 13:06:42 CEST 2006 - olh@xxxxxxx
+
+- include fsck binary if fstab root mountpoint contains colons
+
+-------------------------------------------------------------------
+Fri Apr 21 11:24:14 CEST 2006 - olh@xxxxxxx
+
+- consider bootsplash only on DOS compatibles
+
+-------------------------------------------------------------------
+Thu Apr 20 23:45:36 CEST 2006 - olh@xxxxxxx
+
+- remove dead code in /init script, rootdevn serves no purpose
+
+-------------------------------------------------------------------
+Thu Apr 20 23:44:00 CEST 2006 - olh@xxxxxxx
+
+- fix typo in lvm2 detection, better lvdisplay output parsing
+
+-------------------------------------------------------------------
+Thu Apr 20 23:39:11 CEST 2006 - olh@xxxxxxx
+
+- remove hardcoded /dev/md0 to allow root on md1 and above (#164600)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.i8vLui/_old 2006-04-21 16:29:08.000000000 +0200
+++ /var/tmp/diff_new_pack.i8vLui/_new 2006-04-21 16:29:08.000000000 +0200
@@ -18,7 +18,7 @@
# bootsplash required only if creating splash initrd's.
Autoreqprov: on
Version: 1.2
-Release: 91
+Release: 93
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -85,6 +85,18 @@
%doc %{_mandir}/man8/mkinitrd.8.gz

%changelog -n mkinitrd
+* Fri Apr 21 2006 - olh@xxxxxxx
+- remove +s bits from mount to allow mkinitrd as unprivileged user
+* Fri Apr 21 2006 - olh@xxxxxxx
+- include fsck binary if fstab root mountpoint contains colons
+* Fri Apr 21 2006 - olh@xxxxxxx
+- consider bootsplash only on DOS compatibles
+* Thu Apr 20 2006 - olh@xxxxxxx
+- remove dead code in /init script, rootdevn serves no purpose
+* Thu Apr 20 2006 - olh@xxxxxxx
+- fix typo in lvm2 detection, better lvdisplay output parsing
+* Thu Apr 20 2006 - olh@xxxxxxx
+- remove hardcoded /dev/md0 to allow root on md1 and above (#164600)
* Wed Apr 19 2006 - olh@xxxxxxx
- escape udev_timeout variable
* Wed Apr 19 2006 - olh@xxxxxxx




++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-04-19 15:13:32.000000000 +0200
+++ mkinitrd/mkinitrd 2006-04-21 15:47:48.000000000 +0200
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.278 $
+# $Revision: 1.284 $

usage() {
cat<<EOF
@@ -139,7 +139,7 @@
domu_modules_set=
feature_list=
boot_dir=
-splash="auto"
+splash=off
use_static_binaries=
acpi_dsdt=
use_selinux=
@@ -148,8 +148,8 @@

# architecture dependend changes:
case "$(uname -m)" in
- s390|s390x)
- splash=off
+ i?86|x86_64)
+ splash="auto"
;;
esac

@@ -1623,8 +1623,6 @@
| esac
|done
|
- |# Fallback root device number
- |rootdevn=$rootdevn
|
|for o in \$(cat /proc/cmdline); do
| case \$o in
@@ -1690,19 +1688,16 @@
| maj=\$((0x0\$rootdev >> 8))
| min=\$((0x0\$rootdev & 0xff))
| echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
- | rootdevn=\$maj:\$min
| rootdev=/dev/root ;;
| [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])
| maj=\$((0x\$rootdev >> 8))
| min=\$((0x\$rootdev & 0xff))
| echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
- | rootdevn=\$maj:\$min
| rootdev=/dev/root ;;
| 0x[0-9a-fA-F][0-9a-fA-F]*)
| maj=\$((\$rootdev >> 8))
| min=\$((\$rootdev & 0xff))
| echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
- | rootdevn=\$maj:\$min
| rootdev=/dev/root ;;
| *:*)
| rootfstype="nfs"
@@ -2800,6 +2795,7 @@

pushd . > /dev/null 2>&1
cd $tmp_mnt
+ find bin sbin -type f -print0 | xargs -0 chmod 0755
find . ! -name "*~" | cpio -H newc --create | gzip -9 > $tmp_initrd.gz
popd > /dev/null 2>&1
if ! cp -f $tmp_initrd.gz $initrd_image ; then
@@ -2843,16 +2839,38 @@

realrootdev="$rootdev"
case "$rootdev" in
+ /*:*)
+ ;;
*:*)
rootdev=
rootfstype=nfs
;;
/dev/md*)
+ rootcpio=`echo $root_dir/ | cpio --quiet -o -H newc`
+ rootmajor=0x${rootcpio:62:8}
+ rootminor=0x${rootcpio:70:8}
+ mm=
+ for i in /sys/block/*/dev /sys/block/*/*/dev
+ do
+ if test -f $i
+ then
+ read mm < $i
+ if test "$mm" = "$((rootmajor)):$((rootminor))"
+ then
+ /bin/mknod -m600 ${work_dir}/rootdev b $((rootmajor)) $((rootminor))
+ mm=${i%/dev}
+ mm=${mm##*/}
+ break
+ fi
+ else
+ break
+ fi
+ done
# get md UUID
- md_uuid=$(mdadm -Db /dev/md0 | xargs -n1 echo | awk -F = '/^UUID/ { print $2 }')
- md_uuid=${md_uuid#UUID=}
- md_minor=${rootdev#/dev/md}
+ md_uuid=$(mdadm -Db ${work_dir}/rootdev | xargs -n1 echo | awk -F = '/^UUID/ { print $2 }')
+ md_minor=${mm#md}
md_dev=$rootdev
+ unset mm
;;
/dev/sd*)
# Check for iSCSI
@@ -2946,7 +2964,7 @@
done
# Check whether we are using LVM2
rootmajor=$(devmajor $rootdevn)
- rootminor=$(devminor $roodevn)
+ rootminor=$(devminor $rootdevn)
vg_line=$(lvdisplay -c 2> /dev/null | grep ":$rootmajor:$rootminor")
if [ "$vg_line" ] ; then
root_lvm2=1





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >