From 35eeea0bf89fb6b4d43dd4dfb664d5543ee2cdb6 Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 12 Jan 2024 12:28:37 -0100 Subject: [PATCH] update build scripts --- deb-installer/preseed/preseed.cfg | 2 -- my-distro-debian-32-pae/build.sh | 4 ++-- my-distro-debian-32/build.sh | 4 ++-- my-distro-debian-64/build.sh | 4 ++-- my-distro-devuan-32-pae/build.sh | 4 ++-- my-distro-devuan-32/build.sh | 4 ++-- my-distro-devuan-64/build.sh | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/deb-installer/preseed/preseed.cfg b/deb-installer/preseed/preseed.cfg index 62e43154..71dc9201 100644 --- a/deb-installer/preseed/preseed.cfg +++ b/deb-installer/preseed/preseed.cfg @@ -27,6 +27,4 @@ popularity-contest popularity-contest/participate boolean false # use sudo). d-i passwd/root-login boolean false -### Keep /etc/default/grub file -d-i grub-pc/default string keep diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index 322ad60d..e6237903 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-32-pae/build.sh @@ -236,12 +236,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -257,7 +257,7 @@ mkdir -p $build/build/config/includes.installer//usr/share # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh index 32148920..3df0cc70 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-32/build.sh @@ -238,12 +238,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -259,7 +259,7 @@ mkdir -p $build/build/config/includes.installer//usr/share # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh index bd3b6545..6dd2f74c 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-64/build.sh @@ -237,12 +237,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -258,7 +258,7 @@ mkdir -p $build/build/config/includes.installer//usr/share # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 2d5359e4..16ea7187 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -239,12 +239,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -261,7 +261,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index a5413cdf..e9da5288 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -239,12 +239,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -261,7 +261,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index e088a407..61b64fe7 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -239,12 +239,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -261,7 +261,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin