summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-18 09:01:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-18 09:01:19 +0000
commit4bccfb3f18c8ab991a97bdc9e90268b4d48bb607 (patch)
tree05a82f2472cf9044892c3e21f8233b3c314af882 /images
parentdc1b413b2c742a1d69505cea1c93d3ba421d7801 (diff)
downloaddrakx-4bccfb3f18c8ab991a97bdc9e90268b4d48bb607.tar
drakx-4bccfb3f18c8ab991a97bdc9e90268b4d48bb607.tar.gz
drakx-4bccfb3f18c8ab991a97bdc9e90268b4d48bb607.tar.bz2
drakx-4bccfb3f18c8ab991a97bdc9e90268b4d48bb607.tar.xz
drakx-4bccfb3f18c8ab991a97bdc9e90268b4d48bb607.zip
fix live stage2 support
as documented in config-stage1.h: /* - if we use a compressed image : STAGE2_LOCATION is a the mount point - if we use the live: STAGE2_LOCATION is a relative symlink to image/install/stage2/live */ #define STAGE2_LOCATION "/tmp/stage2" ie /tmp/stage2 is not always a directory
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 3 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 9aa12ee01..b7c6518d0 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- fix live stage2 support
+
Version 1.25 - 12 December 2007, by Pascal "Pixel" Rigaux
- rebuild for new list_modules
diff --git a/images/make_boot_img b/images/make_boot_img
index c381667ae..016281cbf 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -176,7 +176,7 @@ sub initrd {
}
# ka deploy need some files in all.rdz
{
- map { mkdir_p("$tmp_initrd/$_") } qw(sbin dev ka proc sbin tmp/stage2 var/tmp);
+ map { mkdir_p("$tmp_initrd/$_") } qw(sbin dev ka proc sbin var/tmp);
symlink("/sbin", "$tmp_initrd/bin");
cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client");
cp_af("/usr/bin/mke2fs_diet", "$tmp_initrd/sbin/mke2fs");