livemedia-creator two little follow-ups of --make-pxe-live patch

[PATCH 1/2 livemedia-creator] Override services kickstart setting from interactive-defaults.ks

[Radek Vykydal]

---
 docs/rhel-atomic-pxe-live.ks | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/rhel-atomic-pxe-live.ks b/docs/rhel-atomic-pxe-live.ks
index b5d90f2..b8a3f3a 100644
--- a/docs/rhel-atomic-pxe-live.ks
+++ b/docs/rhel-atomic-pxe-live.ks
@@ -13,12 +13,12 @@ part /boot --size=500 --fstype="ext4"

shutdown

-services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
-
 # Using ostree repo included in installation iso. Respective ostreesetup command is included here.
 # The included kickstart file with the command is created during installation iso compose.
 %include /usr/share/anaconda/interactive-defaults.ks

+services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
+
 # We copy content of separate /boot partition to root part when building live squashfs image,
 # and we don't want systemd to try to mount it when pxe booting
 %post

[PATCH 1/2 livemedia-creator] Override services kickstart setting from interactive-defaults.ks

[Colin Walters]

On Tue, Jan 13, 2015, at 06:54 AM, Radek Vykydal wrote:
> -services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
>
> # Using ostree repo included in installation iso. Respective ostreesetup command is included here.
>  # The included kickstart file with the command is created during installation iso compose.
>  %include /usr/share/anaconda/interactive-defaults.ks
>
> +services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup

Last time I tried this the semantics of %include in kickstart with "services --{enabled,disabled}",
it didn't quite work as you'd expect; the --enabled always won, last I tried  See:

https://git.fedorahosted.org/cgit/fedora-atomic.git/commit/?id=de8e30948143f...

[PATCH 1/2 livemedia-creator] Override services kickstart setting from interactive-defaults.ks

[Chris Lumens]

> Last time I tried this the semantics of %include in kickstart with "services --{enabled,disabled}",
> it didn't quite work as you'd expect; the --enabled always won, last I tried  See:

Yeah, that's how it works:

def execute(self, storage, ksdata, instClass):
        for svc in self.disabled:
            if not svc.endswith(".service"):
                svc += ".service"

iutil.execInSysroot("systemctl", ["disable", svc])

for svc in self.enabled:
            if not svc.endswith(".service"):
                svc += ".service"

iutil.execInSysroot("systemctl", ["enable", svc])

All the includes get smashed together into a single ksdata object (which
is by design and allows for overriding things decided elsewhere), thus
all the disables and enables end up in two single lists.

I'd be interested in any refinements that could be done here.

- Chris

[PATCH 2/2 livemedia-creator] --make-pxe-target: change permissions of regenerated initramrfs to 0644

[Radek Vykydal]

---
 src/sbin/livemedia-creator | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index a328623..87da464 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -608,6 +608,7 @@ def rebuild_initrds_for_live(opts, sys_root_dir, results_dir):

new_initrd_path = joinpaths(results_dir, os.path.basename(kernel.initrd.path))
         shutil.move(joinpaths(sys_root_dir, outfile), new_initrd_path)
+        os.chmod(new_initrd_path, 0644)
         shutil.copy2(joinpaths(sys_root_dir, kernel.path), results_dir)

os.unlink(joinpaths(sys_root_dir,"/proc/modules"))

[Chris Lumens]

These look good to me.

- Chris