Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit kiwi
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 21 Sep 2007 15:59:42 +0200
- Message-id: <20070921135942.9FAC06781B8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kiwi
checked in at Fri Sep 21 15:59:42 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-09-20 17:41:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-09-21 15:46:03.217655000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 21 09:42:27 CEST 2007 - ms@xxxxxxx
+
+- pass allong $@ to init process (#327037)
+- fixed remote download of pattern files (#327096)
+- added updateMTAB function for all linuxrc's (#326386)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.TDU846/_old 2007-09-21 15:58:12.000000000 +0200
+++ /var/tmp/diff_new_pack.TDU846/_new 2007-09-21 15:58:12.000000000 +0200
@@ -16,7 +16,7 @@
Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils
Summary: OpenSuSE - KIWI Image System
Version: 1.64
-Release: 16
+Release: 18
Group: System/Management
License: GPL v2 or later
Source: kiwi.tar.bz2
@@ -326,6 +326,10 @@
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Fri Sep 21 2007 - ms@xxxxxxx
+- pass allong $@ to init process (#327037)
+- fixed remote download of pattern files (#327096)
+- added updateMTAB function for all linuxrc's (#326386)
* Thu Sep 20 2007 - ms@xxxxxxx
- fixed usage of basename and dirname by using File::Basename and
in scripts use /usr/bin/[basename|dirname] so a function can't
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2007-09-19 18:46:00.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2007-09-21 14:31:27.000000000 +0200
@@ -434,6 +434,21 @@
done
}
#======================================
+# updateMTAB
+#--------------------------------------
+function updateMTAB {
+ prefix=$1
+ umount=0
+ if [ ! -e /proc/mounts ];then
+ mount -t proc proc /proc
+ umount=1
+ fi
+ cat /proc/mounts > $prefix/etc/mtab
+ if [ $umount = 1 ];then
+ umount /proc
+ fi
+}
+#======================================
# probeNetworkCard
#--------------------------------------
function probeNetworkCard {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIPattern.pm new/kiwi/modules/KIWIPattern.pm
--- old/kiwi/modules/KIWIPattern.pm 2007-09-18 14:05:36.000000000 +0200
+++ new/kiwi/modules/KIWIPattern.pm 2007-09-21 15:41:33.000000000 +0200
@@ -190,31 +190,44 @@
my $title = $response -> title ();
$content = $response -> content ();
if ((! defined $title) || ($title =~ /not found/i)) {
- return undef;
+ $location = $publics_url."/suse/setup/descr";
+ $request = HTTP::Request->new (GET => $location);
+ $response = $browser -> request ( $request );
+ $title = $response -> title ();
+ $content = $response -> content ();
+ if ((! defined $title) || ($title =~ /not found/i)) {
+ return undef;
+ }
}
my $pzip = 0;
if ($content !~ /\"($pattern-.*$arch\.pat)\"/) {
if ($content !~ /\"($pattern-.*$arch\.pat\.gz)\"/) {
return undef;
} else {
+ $location = $location."/".$1;
$pzip = 1;
}
+ } else {
+ $location = $location."/".$1;
}
- $location = $location."/".$1;
$request = HTTP::Request->new (GET => $location);
$response = $browser -> request ( $request );
$content = $response -> content ();
if ($pzip) {
my $tmpdir = qx ( mktemp -q -d /tmp/kiwipattern.XXXXXX );
+ chomp $tmpdir;
my $result = $? >> 8;
if ($result != 0) {
return undef;
}
if (! open (FD,">$tmpdir/pattern")) {
+ rmdir ($tmpdir);
return undef;
}
print FD $content; close FD;
if (! open (FD,"cat $tmpdir/pattern | gzip -cd|")) {
+ unlink ($tmpdir."/pattern");
+ rmdir ($tmpdir);
return undef;
}
local $/; $content .= <FD>; close FD;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-09-20 17:41:06.000000000 +0200
+++ new/kiwi/.revision 2007-09-21 15:45:41.000000000 +0200
@@ -1 +1 @@
-634
\ No newline at end of file
+638
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-linuxrc new/kiwi/system/boot/isoboot/suse-linuxrc
--- old/kiwi/system/boot/isoboot/suse-linuxrc 2007-07-23 17:58:39.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-09-21 15:16:50.000000000 +0200
@@ -318,9 +318,10 @@
echo " "
echo "Booting into Live CD System..."
echo "------------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / &>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-preinit new/kiwi/system/boot/isoboot/suse-preinit
--- old/kiwi/system/boot/isoboot/suse-preinit 2007-03-21 16:34:03.000000000 +0100
+++ new/kiwi/system/boot/isoboot/suse-preinit 2007-09-21 14:31:26.000000000 +0200
@@ -20,5 +20,6 @@
. /include
#======================================
-# nothing to do here for isoboot
+# 1) update mount table
#--------------------------------------
+updateMTAB
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-linuxrc new/kiwi/system/boot/netboot/suse-linuxrc
--- old/kiwi/system/boot/netboot/suse-linuxrc 2007-09-17 10:51:12.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-09-21 15:16:50.000000000 +0200
@@ -863,9 +863,10 @@
echo " "
echo "Booting into final System..."
echo "----------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / 2>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-preinit new/kiwi/system/boot/netboot/suse-preinit
--- old/kiwi/system/boot/netboot/suse-preinit 2007-05-21 14:41:51.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-preinit 2007-09-21 14:31:25.000000000 +0200
@@ -27,7 +27,12 @@
fi
#======================================
-# 2) create initrd on diskful
+# 2) update mount table
+#--------------------------------------
+updateMTAB
+
+#======================================
+# 3) create initrd on diskful
#--------------------------------------
if test -z $KIWI_INITRD;then
if test ! -z $DISK;then
@@ -48,7 +53,7 @@
fi
#======================================
-# 3) Install boot loader on diskful
+# 4) Install boot loader on diskful
#--------------------------------------
if test ! -z $DISK;then
if test $systemIntegrity = "clean";then
@@ -64,7 +69,7 @@
fi
#======================================
-# 4) Reset systemIntegrity
+# 5) Reset systemIntegrity
#--------------------------------------
if test ! -z $DISK;then
if test ! -z $RELOAD_CONFIG;then
@@ -73,7 +78,7 @@
fi
#======================================
-# 5) check for valid mount points
+# 6) check for valid mount points
#--------------------------------------
if test ! -z $DISK;then
IFS=":" ; for i in $PART_MOUNT;do
@@ -86,7 +91,7 @@
fi
#======================================
-# 6) Update /etc/ImageVersion files
+# 7) Update /etc/ImageVersion files
#--------------------------------------
if test ! -z $DISK;then
count=0
@@ -112,7 +117,7 @@
fi
#======================================
-# 7) setup network for nfs boot
+# 8) setup network for nfs boot
#--------------------------------------
if test ! -z $NFSROOT;then
mount -o nolock -t proc proc /proc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-linuxrc new/kiwi/system/boot/oemboot/suse-linuxrc
--- old/kiwi/system/boot/oemboot/suse-linuxrc 2007-09-20 16:14:04.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-09-21 15:16:49.000000000 +0200
@@ -658,10 +658,11 @@
echo " "
echo "Booting into final System..."
echo "----------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / 2>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-preinit new/kiwi/system/boot/oemboot/suse-preinit
--- old/kiwi/system/boot/oemboot/suse-preinit 2007-09-20 11:57:55.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-preinit 2007-09-21 14:31:25.000000000 +0200
@@ -27,6 +27,11 @@
fi
#======================================
+# 2) update mount table
+#--------------------------------------
+updateMTAB
+
+#======================================
# 2) create initrd on diskful
#--------------------------------------
grubOK=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-linuxrc new/kiwi/system/boot/usbboot/suse-linuxrc
--- old/kiwi/system/boot/usbboot/suse-linuxrc 2007-09-14 15:17:36.000000000 +0200
+++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-09-21 15:16:50.000000000 +0200
@@ -191,9 +191,10 @@
echo " "
echo "Booting into USB-Stick System..."
echo "--------------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / &>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-preinit new/kiwi/system/boot/usbboot/suse-preinit
--- old/kiwi/system/boot/usbboot/suse-preinit 2007-03-21 16:34:03.000000000 +0100
+++ new/kiwi/system/boot/usbboot/suse-preinit 2007-09-21 14:31:25.000000000 +0200
@@ -20,5 +20,6 @@
. /include
#======================================
-# nothing to do here for usbboot
+# 1) update mount table
#--------------------------------------
+updateMTAB
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-linuxrc new/kiwi/system/boot/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/vmxboot/suse-linuxrc 2007-09-12 13:26:26.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-09-21 15:16:51.000000000 +0200
@@ -287,9 +287,10 @@
echo " "
echo "Booting into final System..."
echo "----------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / 2>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-preinit new/kiwi/system/boot/vmxboot/suse-preinit
--- old/kiwi/system/boot/vmxboot/suse-preinit 2007-06-14 09:26:09.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-preinit 2007-09-21 14:31:26.000000000 +0200
@@ -20,7 +20,12 @@
. /include
#======================================
-# 1) check for union filesystem
+# 1) update mount table
+#--------------------------------------
+updateMTAB
+
+#======================================
+# 2) check for union filesystem
#--------------------------------------
if [ ! -z "$UNIONFS_CONFIG" ]; then
# /.../
@@ -32,7 +37,7 @@
fi
#======================================
-# 2) create initrd on diskful
+# 3) create initrd on diskful
#--------------------------------------
if test -L /boot/boot;then
mount -t proc proc /proc
@@ -46,7 +51,7 @@
fi
#======================================
-# 3) Install boot loader on diskful
+# 4) Install boot loader on diskful
#--------------------------------------
if test -f "/usr/sbin/grub";then
Echo "Installing boot loader..."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-linuxrc new/kiwi/system/boot/xenboot/suse-linuxrc
--- old/kiwi/system/boot/xenboot/suse-linuxrc 2007-05-21 14:41:51.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-09-21 15:16:51.000000000 +0200
@@ -147,9 +147,10 @@
echo " "
echo "Booting into Xen System..."
echo "--------------------------"
+export IFS=$IFS_ORIG
mount -n -o remount,rw / &>/dev/null
if [ $PIVOT = "true" ];then
exec umount -n -l /mnt
else
- exec chroot . /sbin/init
+ exec chroot . /sbin/init $@
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-preinit new/kiwi/system/boot/xenboot/suse-preinit
--- old/kiwi/system/boot/xenboot/suse-preinit 2007-03-21 16:34:03.000000000 +0100
+++ new/kiwi/system/boot/xenboot/suse-preinit 2007-09-21 14:31:26.000000000 +0200
@@ -20,5 +20,6 @@
. /include
#======================================
-# nothing to do here for xenboot
+# 1) update mount table
#--------------------------------------
+updateMTAB
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |