4 files changed, 39 insertions, 7 deletions
diff --git a/configs/profile/root-image/etc/pacman-offline.conf b/configs/profile/root-image/etc/pacman-offline.conf
new file mode 100644
index 0000000..82ca0ae
--- /dev/null
+++ b/configs/profile/root-image/etc/pacman-offline.conf
@@ -0,0 +1,11 @@
+
+[options]
+HoldPkg           = pacman glibc
+Architecture      = auto
+CheckSpace
+SigLevel          = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+[isorepo]
+SigLevel = Optional TrustAll
+Server   = file:///isorepo/
diff --git a/configs/profile/root-image/etc/pacman-online.conf b/configs/profile/root-image/etc/pacman-online.conf
new file mode 100644
index 0000000..d77556f
--- /dev/null
+++ b/configs/profile/root-image/etc/pacman-online.conf
@@ -0,0 +1,25 @@
+
+[options]
+HoldPkg           = pacman glibc
+Architecture      = auto
+CheckSpace
+SigLevel          = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+[libre]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+[pcr]
+Include = /etc/pacman.d/mirrorlist
+
+[pcr-testing]
+Include = /etc/pacman.d/mirrorlist
diff --git a/configs/profile/root-image/etc/pacman.conf b/configs/profile/root-image/etc/pacman.conf
index dddaca6..d77556f 100644
--- a/configs/profile/root-image/etc/pacman.conf
+++ b/configs/profile/root-image/etc/pacman.conf
@@ -6,10 +6,6 @@ CheckSpace
 SigLevel          = Required DatabaseOptional
 LocalFileSigLevel = Optional
 
-[isorepo]
-SigLevel = Optional TrustAll
-Server   = file:///isorepo/
-
 [libre]
 Include = /etc/pacman.d/mirrorlist
 
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index cbcf868..6717d86 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -23,7 +23,7 @@ then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/m
 fi
 # KLUDGE end
 # KLUDGE begin temp until next calamares rebuild # FIXME:
-cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
+# cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
 sed -i 's|requiredStorage:.*|requiredStorage:    8.9|' /usr/share/calamares/modules/welcome.conf
 # KLUDGE end
 
@@ -80,11 +80,11 @@ else # configure GUI login session and live user
      sed -i "s|/issue-tracker/|/isos/|"         /home/${LIVE_USER}/Desktop/bug-tracker.desktop
      if   [[ "${iso_gui}" == 'lxde' ]]
      then rm -f /etc/xdg/autostart/octopi-notifier.desktop 2> /dev/null
-          sed -i "s|_DESKTOP_SESSION_|LXDE|"    /home/${LIVE_USER}/.bash_profile
-          sed -i "s|_DESKTOP_SESSION_|LXDE|"    /home/${LIVE_USER}/.dmrc
           touch /home/${LIVE_USER}/Desktop/parabola-installer.desktop ; sleep 2 ; # sort
           touch /home/${LIVE_USER}/Desktop/parabola-irc.desktop       ; sleep 2 ; # sort
           touch /home/${LIVE_USER}/Desktop/bug-tracker.desktop                    # sort
+          sed -i "s|_DESKTOP_SESSION_|LXDE|"    /home/${LIVE_USER}/.bash_profile
+          sed -i "s|_DESKTOP_SESSION_|LXDE|"    /home/${LIVE_USER}/.dmrc
      elif [[ "${iso_gui}" == 'mate' ]]
      then sed -i "s|_DESKTOP_SESSION_|mate|"    /home/${LIVE_USER}/.bash_profile
           sed -i "s|_DESKTOP_SESSION_|mate|"    /home/${LIVE_USER}/.dmrc