summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-06-29 15:26:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-06-29 15:26:06 +0000
commitbabf230cee1a9db93791a91da0ed4a13d8bdf204 (patch)
treecf1a1b281e0342d74a01288433a351a40c85273a
parent54141ba1267c509456c9992322e6122196909c65 (diff)
downloaddrakx-backup-do-not-use-babf230cee1a9db93791a91da0ed4a13d8bdf204.tar
drakx-backup-do-not-use-babf230cee1a9db93791a91da0ed4a13d8bdf204.tar.gz
drakx-backup-do-not-use-babf230cee1a9db93791a91da0ed4a13d8bdf204.tar.bz2
drakx-backup-do-not-use-babf230cee1a9db93791a91da0ed4a13d8bdf204.tar.xz
drakx-backup-do-not-use-babf230cee1a9db93791a91da0ed4a13d8bdf204.zip
1.11
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS3
-rwxr-xr-ximages/make_boot_img2
3 files changed, 4 insertions, 3 deletions
diff --git a/images/Makefile b/images/Makefile
index a724412f0..b0a232c3d 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.10
+VERSION=1.11
PRODUCT=drakx-installer-images
IMAGES_DEST = $(ROOTDEST)/install/images
diff --git a/images/NEWS b/images/NEWS
index e8af3f4a4..2748fd61e 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,5 +1,6 @@
-Version 1.10 - 29 June 2007, by Pascal "Pixel" Rigaux
+Version 1.11 - 29 June 2007, by Pascal "Pixel" Rigaux
+- increase all.img size to 10.5MB
- default to theme Mandriva-Free, and allow setting another one through THEME
environment variable
diff --git a/images/make_boot_img b/images/make_boot_img
index fc761d20b..043d99001 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -225,7 +225,7 @@ sub remove_ending_zero {
sub boot_img_i386 {
my ($type, $I, $img, $kernel) = @_;
- _ "dd if=/dev/zero of=$img bs=1k count=" . ($type eq 'all' ? 10000 : $type eq 'ka' ? 2950 : 1440);
+ _ "dd if=/dev/zero of=$img bs=1k count=" . ($type eq 'all' ? 10500 : $type eq 'ka' ? 2950 : 1440);
_ "rm -rf $tmp_mnt"; mkdir $tmp_mnt;
_ "cat $kernel > $tmp_mnt/vmlinuz";