diff --git a/PepDev32/pepbld.py b/PepDev32/pepbld.py index d9f3531..50a4aa4 100644 --- a/PepDev32/pepbld.py +++ b/PepDev32/pepbld.py @@ -77,6 +77,7 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), exist_ok=True) +os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) @@ -90,6 +91,8 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.j shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) # Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 57e27ae..711a0fc 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -68,6 +68,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/protools mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/polkit mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/conf mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/py +mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/info mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/lightdm mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/autostart mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share @@ -90,6 +91,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub +cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev64/pepbld.py b/PepDev64/pepbld.py index b9c8314..4f4c1c0 100644 --- a/PepDev64/pepbld.py +++ b/PepDev64/pepbld.py @@ -76,6 +76,7 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), exist_ok=True) +os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) @@ -89,6 +90,8 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.j shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) # Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index d84f256..bf12bae 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -68,6 +68,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/protools mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/polkit mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/conf mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/py +mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/info mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/lightdm mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/autostart mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share @@ -90,6 +91,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub +cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev_arm64/pepbld.py b/PepDev_arm64/pepbld.py index 300e8ca..3faabc3 100644 --- a/PepDev_arm64/pepbld.py +++ b/PepDev_arm64/pepbld.py @@ -80,6 +80,7 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), exist_ok=True) +os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) @@ -93,6 +94,8 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.j shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) +shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) # Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index df85b00..2761c98 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -71,6 +71,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/protools mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/polkit mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/conf mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/py +mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/info mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/lightdm mkdir -p $uchinanchu/fusato/config/includes.installer/preseed/autostart mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share @@ -93,6 +94,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub +cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary diff --git a/pepscriptsdev/06copy-files-to-target b/pepscriptsdev/06copy-files-to-target index 148a211..efeb222 100755 --- a/pepscriptsdev/06copy-files-to-target +++ b/pepscriptsdev/06copy-files-to-target @@ -24,6 +24,7 @@ mkdir -p /target/usr/share/pixmaps mkdir -p /target/etc/lightdm mkdir -p /target/usr/lib/python3/dist-packages mkdir -p /target/boot/grub +mkdir -p /target/usr/share/python-apt/templates # Copy files to the chroot directory cp /preseed/grub/grub /target/etc/default @@ -41,6 +42,7 @@ cp /preseed/polkit/* /target/usr/share/polkit-1/actions cp /preseed/pixmaps/* /target/usr/share/pixmaps cp /preseed/lightdm/* /target/etc/lightdm cp /preseed/autostart/* /target/etc/skel/.config/autostart +cp /preseed/info/* /target/usr/share/python-apt/templates # Copy recursive files and sub-directories cp -r /preseed/grub/themes /target/boot/grub