From c6adc16285d25b215c9409c815376271fc42e149 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Wed, 9 Jan 2019 14:44:24 -0600 Subject: [PATCH 1/3] Bring in firefox from buster --- resources/BuildResources/apt-preferences | 7 +++++++ resources/BuildResources/sources.list | 9 ++++++--- scripts/InstallScripts/InstallPackages.sh | 3 +++ scripts/buildDebianFs.sh | 5 +++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 resources/BuildResources/apt-preferences diff --git a/resources/BuildResources/apt-preferences b/resources/BuildResources/apt-preferences new file mode 100644 index 0000000..c185779 --- /dev/null +++ b/resources/BuildResources/apt-preferences @@ -0,0 +1,7 @@ +Package: * +Pin: release a=stable +Pin-Priority: 700 + +Package: * +Pin: release a=testing +Pin-Priority: 650 diff --git a/resources/BuildResources/sources.list b/resources/BuildResources/sources.list index 7024333..713ce19 100644 --- a/resources/BuildResources/sources.list +++ b/resources/BuildResources/sources.list @@ -4,6 +4,9 @@ deb-src http://ftp.us.debian.org/debian stretch main deb http://ftp.us.debian.org/debian stretch-updates main deb-src http://ftp.us.debian.org/debian stretch-updates main -#Disable these, as the new versions of firefox or chromium installed crash immediately see issue #29 -#deb http://security.debian.org/debian-security/ stretch/updates main -#deb-src http://security.debian.org/debian-security/ stretch/updates main +deb http://security.debian.org/debian-security/ stretch/updates main +deb-src http://security.debian.org/debian-security/ stretch/updates main + +#Add buster to grab a functional firefox release +# /etc/apt/preferences prevents this from updating the whole system +deb http://deb.debian.org/debian/ testing main \ No newline at end of file diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index df2b63f..718a14e 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -32,6 +32,9 @@ locale-gen apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs25 apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome +#install firefox from buster +apt -t testing install -y firefox-esr + [ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice firefox-esr [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh index c6ac1af..1768142 100755 --- a/scripts/buildDebianFs.sh +++ b/scripts/buildDebianFs.sh @@ -95,6 +95,8 @@ chmod +x $outmnt/*.sh #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests cp /etc/hosts $outmnt/etc/ cp $build_resources/sources.list $outmnt/etc/apt/sources.list +#setup apt pinning +cp $build_resources/apt-preferences $outmnt/etc/apt/preferences #Setup the locale chroot $outmnt echo en_US.UTF-8 UTF-8 > /etc/locale.gen @@ -111,6 +113,9 @@ chroot $outmnt apt-get clean #Download the packages to be installed by Install.sh: chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice firefox-esr sudo pavucontrol-qt +#Grab firefox from buster, since stretch is broken +chroot $outmnt apt -t testing install -y -d firefox-esr + #Download support for libinput-gestures chroot $outmnt apt install -y libinput-tools xdotool build-essential #Package is copied into /InstallResources/packages From 7259ebf426a25752ad29481d3f18deea59cd6f7f Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Wed, 9 Jan 2019 14:46:13 -0600 Subject: [PATCH 2/3] ensure rsync gets installed --- scripts/buildDebianFs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh index 1768142..cafaabe 100755 --- a/scripts/buildDebianFs.sh +++ b/scripts/buildDebianFs.sh @@ -104,7 +104,7 @@ chroot $outmnt locale-gen #Install the base packages chroot $outmnt apt update -chroot $outmnt apt install -y initscripts udev kmod net-tools inetutils-ping traceroute iproute2 isc-dhcp-client wpasupplicant iw alsa-utils cgpt vim-tiny less psmisc netcat-openbsd ca-certificates bzip2 xz-utils ifupdown nano apt-utils git kpartx gdisk parted +chroot $outmnt apt install -y initscripts udev kmod net-tools inetutils-ping traceroute iproute2 isc-dhcp-client wpasupplicant iw alsa-utils cgpt vim-tiny less psmisc netcat-openbsd ca-certificates bzip2 xz-utils ifupdown nano apt-utils git kpartx gdisk parted rsync #Cleanup to reduce install size chroot $outmnt apt-get autoremove --purge From 633314928242979de3c6f315eefc86aef134b91f Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Wed, 9 Jan 2019 15:05:50 -0600 Subject: [PATCH 3/3] Have the user set a root password --- scripts/InstallScripts/InstallPackages.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 718a14e..72cadc7 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -109,6 +109,10 @@ systemctl enable fstrim.timer dmesg -D +#Have the user set a root password +echo " Enter a password for the root user" +passwd + #Force a safe username while true; do echo " Enter new username: "