diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-08-10 16:22:34 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-08-14 09:27:22 +0200 |
| commit | b936ec7f787176003c8d4be43998fc68843bd56c (patch) | |
| tree | d756211c61c59ddf56a5ff7e4024e775491489db | |
| parent | Start with diskimage target descriptions (diff) | |
| download | catalyst-dilfridge/qcow2.tar.gz catalyst-dilfridge/qcow2.tar.bz2 catalyst-dilfridge/qcow2.zip | |
minordilfridge/qcow2
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
| -rw-r--r-- | catalyst/targets/diskimage_stage2.py | 6 | ||||
| -rwxr-xr-x | targets/diskimage-stage2/controller.sh | 20 |
2 files changed, 4 insertions, 22 deletions
diff --git a/catalyst/targets/diskimage_stage2.py b/catalyst/targets/diskimage_stage2.py index 83a52a46..e665fb42 100644 --- a/catalyst/targets/diskimage_stage2.py +++ b/catalyst/targets/diskimage_stage2.py @@ -88,10 +88,10 @@ class diskimage_stage2(StageBase): if "fetch" not in self.settings["options"]: self.build_sequence.extend([ self.create_diskimage, # create image file - self.open_diskimage, + self.open_diskimage, # loopback or nbd self.make_filesystems, # partition, make filesystems - self.move_into_image, - self.bootloader, + self.move_into_image, # move files in + self.bootloader, # install bootloader (efi grub?) self.preclean, self.fsscript, self.rcupdate, diff --git a/targets/diskimage-stage2/controller.sh b/targets/diskimage-stage2/controller.sh index 210cc767..9cbf6824 100755 --- a/targets/diskimage-stage2/controller.sh +++ b/targets/diskimage-stage2/controller.sh @@ -26,12 +26,7 @@ case $1 in ;; preclean) - # move over the environment - cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \ - ${clst_chroot_path}/root/.bashrc - cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \ - ${clst_chroot_path}/root/.bash_profile - cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ + cp -f ${clst_sharedir}/diskimage/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start ;; @@ -49,11 +44,6 @@ case $1 in ;; clean) - if [ "${clst_diskimage_type}" = "gentoo-release-minimal" ] - then - # Clean out man, info and doc files - rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/* - fi ;; bootloader) @@ -70,14 +60,6 @@ case $1 in # chroot so newer livecd-tools/genkernel can find it and unpack it. fi - # Move over the readme (if applicable) - if [ -n "${clst_diskimage_readme}" ] - then - cp -f ${clst_diskimage_readme} $1/README.txt - else - cp -f ${clst_sharedir}/livecd/files/README.txt $1 - fi - if [ -e ${clst_chroot_path}/boot/memtest86plus/ ]; then cp -rv ${clst_chroot_path}/boot/memtest86plus/* $1 fi |