summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-05-19 23:18:03 +0000
committerThomas Backlund <tmb@mageia.org>2011-05-19 23:18:03 +0000
commit5af7d9a83aebdc3dc4f8af75bbfed197191fbddf (patch)
tree76bf1b307593ae97b3431f649d83172f9c84c013
parent155a37effb612997ffbc33845f74904186e8cb3f (diff)
downloaddrakx-5af7d9a83aebdc3dc4f8af75bbfed197191fbddf.tar
drakx-5af7d9a83aebdc3dc4f8af75bbfed197191fbddf.tar.gz
drakx-5af7d9a83aebdc3dc4f8af75bbfed197191fbddf.tar.bz2
drakx-5af7d9a83aebdc3dc4f8af75bbfed197191fbddf.tar.xz
drakx-5af7d9a83aebdc3dc4f8af75bbfed197191fbddf.zip
merge mknod, btrfs and XSLoader patches
-rw-r--r--rescue/Makefile2
-rw-r--r--rescue/NEWS6
-rw-r--r--rescue/devices.pl2
-rw-r--r--rescue/list.xml5
4 files changed, 12 insertions, 3 deletions
diff --git a/rescue/Makefile b/rescue/Makefile
index 7ae086b3e..a94f5f4d9 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.23
+VERSION=1.24
PRODUCT=drakx-installer-rescue
RESCUE = rescue.sqfs
diff --git a/rescue/NEWS b/rescue/NEWS
index 3a15ba992..64ae52fca 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,9 @@
+Version 1.24 - 20 May 2011, by tmb
+
+- devices.pl: call mknod directly
+- list.xml: add btrfs tools to the image
+- list.xml: fix XSLoader path
+
Version 1.23 - 06 April 2011, by Dmorgan
- Fix function names ( Bug #651 )
diff --git a/rescue/devices.pl b/rescue/devices.pl
index 0d4a8f77f..0d0c6af9d 100644
--- a/rescue/devices.pl
+++ b/rescue/devices.pl
@@ -14,7 +14,7 @@ foreach (<DATA>) {
}
};
foreach (@l2) {
- my $cmd = "mknod-m600 $_ $typ $maj " . $min++;
+ my $cmd = "mknod -m 600 $_ $typ $maj " . $min++;
system($cmd) == 0 or die "$cmd failed\n";
}
}
diff --git a/rescue/list.xml b/rescue/list.xml
index 17ab5c3d1..7e057931f 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -62,6 +62,9 @@
mkfs.reiserfs resize_reiserfs reiserfstune reiserfsck
mkfs.xfs xfs_admin xfs_repair fsck.xfs
mkfs.ntfs mkdosfs dosfslabel mkntfs ntfsresize ntfslabel
+
+ btrfs btrfsck btrfs-convert btrfsctl btrfs-debug-tree
+ btrfs-map-logical btrfs-show btrfs-vol mkfs.btrfs fsck.btrfs
<if ARCH="i.86|x86_64">
mkfs.jfs fsck.jfs jfs_tune
</if>
@@ -215,7 +218,7 @@
ARCH-linux-thread-multi/auto/POSIX/load_imports.al
ARCH-linux-thread-multi/auto/POSIX/POSIX.so
ARCH-linux-thread-multi/POSIX.pm
- ARCH-linux-thread-multi/XSLoader.pm
+ XSLoader.pm
ARCH-linux-thread-multi/lib.pm
ARCH-linux-thread-multi/Socket.pm
ARCH-linux-thread-multi/IO/Socket.pm