From 3101e840aece20210ccbd92cab80a39a4a229d96 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Tue, 1 Aug 2023 22:43:00 +0400 Subject: [PATCH] Remove local repo scripts --- .../sources-media-unmount/module.desc | 6 ----- calamares-modules/sources-media/module.desc | 6 ----- calamares/modules/netinstall.yaml | 1 + calamares/settings.conf | 2 -- debian/changelog | 6 +++++ scripts/sources-media | 25 ------------------- 6 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 calamares-modules/sources-media-unmount/module.desc delete mode 100644 calamares-modules/sources-media/module.desc delete mode 100755 scripts/sources-media diff --git a/calamares-modules/sources-media-unmount/module.desc b/calamares-modules/sources-media-unmount/module.desc deleted file mode 100644 index 0df415b..0000000 --- a/calamares-modules/sources-media-unmount/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "sources-media-unmount" -interface: "process" -command: "/usr/sbin/sources-media -u" -timeout: 600 diff --git a/calamares-modules/sources-media/module.desc b/calamares-modules/sources-media/module.desc deleted file mode 100644 index 16432f1..0000000 --- a/calamares-modules/sources-media/module.desc +++ /dev/null @@ -1,6 +0,0 @@ ---- -type: "job" -name: "sources-media" -interface: "process" -command: "/usr/sbin/sources-media" -timeout: 600 diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml index 6433b4d..838f282 100644 --- a/calamares/modules/netinstall.yaml +++ b/calamares/modules/netinstall.yaml @@ -185,6 +185,7 @@ - terminator - timeshift - virt-manager + - virtualbox - waydroid - xfce4-terminal - ydotool diff --git a/calamares/settings.conf b/calamares/settings.conf index 23f9229..59f8973 100644 --- a/calamares/settings.conf +++ b/calamares/settings.conf @@ -72,7 +72,6 @@ sequence: - mount - unpackfs - dpkg-unsafe-io - - sources-media - machineid - fstab - locale @@ -92,7 +91,6 @@ sequence: - initramfscfg - initramfs - dpkg-unsafe-io-undo - - sources-media-unmount - sources-final - umount diff --git a/debian/changelog b/debian/changelog index 243a9d5..6f8ffdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-tileos-sway (1.10~tileos) unstable; urgency=medium + + * Remove local repo scripts + + -- Aleksey Samoilov Tue, 01 Aug 2023 22:42:07 +0400 + calamares-settings-tileos-sway (1.9~tileos) unstable; urgency=medium * Require internet for installing diff --git a/scripts/sources-media b/scripts/sources-media deleted file mode 100755 index 0ea8237..0000000 --- a/scripts/sources-media +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -MEDIUM_PATH="/run/live/medium" -RELEASE="bookworm" - -if [ "$1" = "-u" ]; then - umount $CHROOT/$MEDIUM_PATH - rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list - chroot $CHROOT apt-get update - exit 0 -fi - -# Remove the base sources, we will configure sources in a later phase -rm -f $CHROOT/etc/apt/sources.list.d/base.list - -mkdir -p $CHROOT/$MEDIUM_PATH -mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH -echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list -chroot $CHROOT apt-get update -# Attempt safest way to remove cruft -rmdir $CHROOT/run/live/medium -rmdir $CHROOT/run/live - -exit 0