[Sisuite-devel] systemimager-debian - Two new modifications

[Geoffroy Vallée]

Hi,

Two new modifications for systemimager-debian:
1/ i removed the patch 13 (r67) which is not needed any more, uclibc if not
used anymore in systemimager.
2/ update of the patch 15 (15_getimage-custom-boot-in-var.patch). The new
patch is the following and it is also available in my branch (r68)

Thanks,

--- systemimager-3.8.0/sbin/si_getimage.orig 2007-05-11
23:43:45.000000000 -0400
+++ systemimager-3.8.0/sbin/si_getimage 2007-05-11 23:44:43.000000000 -0400
@@ -482,7 +482,7 @@

if (
SystemImager::Server->copy_boot_files_from_image_to_shared_dir(
- $image, $imagedir, $rsync_stub_dir, $autoinstall_boot_dir
+ $image, $imagedir, $rsync_stub_dir, $custom_boot_dir
) == -1
) {
print "WARNING: failed to copy boot files from the image (ignore this
warning if you are not using UYOK).\n";

[dann frazier]

Post by Geoffroy Vallée
Hi,
1/ i removed the patch 13 (r67) which is not needed any more, uclibc if not
used anymore in systemimager.

committed, thanks!

Post by Geoffroy Vallée
2/ update of the patch 15 (15_getimage-custom-boot-in-var.patch). The new
patch is the following and it is also available in my branch (r68)

This seems to remove the initialization of $custom_boot_dir - is that
intentional? If so, why?

[Geoffroy Vallée]

Post by dann frazier

Post by Geoffroy Vallée
2/ update of the patch 15 (15_getimage-custom-boot-in-var.patch). The new
patch is the following and it is also available in my branch (r68)

This seems to remove the initialization of $custom_boot_dir - is that
intentional? If so, why?

I guess i have made a mistake, sorry about that. I will check that ASAP.

[Geoffroy Vallée]

Post by dann frazier

Post by Geoffroy Vallée
2/ update of the patch 15 (15_getimage-custom-boot-in-var.patch). The new
patch is the following and it is also available in my branch (r68)

This seems to remove the initialization of $custom_boot_dir - is that
intentional? If so, why?

Dann, i think i have now a correct patch. Can you review it (r72)?
--- systemimager-3.8.0/etc/systemimager.conf.orig 2007-05-17 00:53:20.000000000 -0400
+++ systemimager-3.8.0/etc/systemimager.conf 2007-05-17 00:52:48.000000000 -0400
@@ -33,6 +33,13 @@

################################################################################
#
+# The directory which contains the architecture specific directories where
+# files needed by autoinstall clients are stored.
+#
+CUSTOM_BOOT_DIR = /var/lib/systemimager/boot
+
+################################################################################
+#
# SystemImager's rsyncd.conf file.
#
RSYNCD_CONF = /etc/systemimager/rsyncd.conf
--- systemimager-3.8.0/lib/SystemImager/Config.pm.orig 2007-05-17 00:54:40.000000000 -0400
+++ systemimager-3.8.0/lib/SystemImager/Config.pm 2007-05-17 00:55:17.000000000 -0400
@@ -27,6 +27,7 @@
'default_override_dir' => { ARGCOUNT => 1 },
'autoinstall_script_dir' => { ARGCOUNT => 1 },
'autoinstall_boot_dir' => { ARGCOUNT => 1 },
+ 'custom_boot_dir' => { ARGCOUNT => 1 },
'rsyncd_conf' => { ARGCOUNT => 1 },
'rsync_stub_dir' => { ARGCOUNT => 1 },
'tftp_dir' => { ARGCOUNT => 1 },
--- systemimager-3.8.0/sbin/si_getimage.orig 2007-05-11 23:43:45.000000000 -0400
+++ systemimager-3.8.0/sbin/si_getimage 2007-05-11 23:44:43.000000000 -0400
@@ -482,7 +482,7 @@

if (
SystemImager::Server->copy_boot_files_from_image_to_shared_dir(
- $image, $imagedir, $rsync_stub_dir, $autoinstall_boot_dir
+ $image, $imagedir, $rsync_stub_dir, $custom_boot_dir
) == -1
) {
print "WARNING: failed to copy boot files from the image (ignore this warning if you are not using UYOK).\n";

[dann frazier]

Post by Geoffroy Vallée

Post by dann frazier

Post by Geoffroy Vallée
2/ update of the patch 15 (15_getimage-custom-boot-in-var.patch). The new
patch is the following and it is also available in my branch (r68)

This seems to remove the initialization of $custom_boot_dir - is that
intentional? If so, why?

Dann, i think i have now a correct patch. Can you review it (r72)?

Thanks, merged.