From f119f660183875f5e525d263db91347e7a55e45f Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Fri, 22 Dec 2017 10:45:41 -0500
Subject: squashme - revert empty isorepo

---
 configs/profile/build.sh                           |  9 +++----
 configs/profile/root-image/etc/pacman-offline.conf | 11 ++++++++
 configs/profile/root-image/etc/pacman-online.conf  | 25 ++++++++++++++++++
 configs/profile/root-image/etc/pacman.conf         | 30 +---------------------
 .../root-image/root/customize_root_image.sh        |  8 +++---
 5 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 configs/profile/root-image/etc/pacman-offline.conf
 create mode 100644 configs/profile/root-image/etc/pacman-online.conf
 mode change 100644 => 120000 configs/profile/root-image/etc/pacman.conf

(limited to 'configs')

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 02eb436..ecd1351 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -139,15 +139,14 @@ make_packages() {
             # download cache packages
             setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_cache_packages}" -O install
         fi
+        # create 'isorepo' for offline install
+        pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null
+        setarch ${arch} repo-add --new isorepo.db.tar.gz ./*
+        popd > /dev/null
     else
         # stash package cache for next build
         mv ${work_dir}/${arch}/root-image/isorepo ${work_dir}/../isorepo-${arch}
-        mkdir ${work_dir}/${arch}/root-image/isorepo
     fi
-    # create 'isorepo'
-    pushd ${work_dir}/${arch}/root-image/isorepo > /dev/null
-    setarch ${arch} repo-add --new isorepo.db.tar.gz ./*
-    popd > /dev/null
 
     # refresh pacman keyring in chroot
     arch-chroot ${work_dir}/${arch}/root-image pacman-key --init                           && \
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
deleted file mode 100644
index dddaca6..0000000
--- a/configs/profile/root-image/etc/pacman.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-
-[options]
-HoldPkg           = pacman glibc
-Architecture      = auto
-CheckSpace
-SigLevel          = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-[isorepo]
-SigLevel = Optional TrustAll
-Server   = file:///isorepo/
-
-[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
new file mode 120000
index 0000000..cec8b80
--- /dev/null
+++ b/configs/profile/root-image/etc/pacman.conf
@@ -0,0 +1 @@
+root-image/etc/pacman-online.conf
\ No newline at end of file
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index cbcf868..ba890b6 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -75,16 +75,16 @@ else # configure GUI login session and live user
 
      # configure desktop environment
      sed -i "s|_EDITION_TITLE_|${PRETTY_NAME}|" /home/${LIVE_USER}/.config/autostart/autostart.sh
-     sed -i "s|--question|--info|"              /home/${LIVE_USER}/.config/autostart/autostart.sh
-     sed -i "s|--cancel-label=.*|\&|"           /home/${LIVE_USER}/.config/autostart/autostart.sh
+     sed -i "s|,Don't show this again:0||"      /home/${LIVE_USER}/.config/autostart/autostart.sh
+     sed -i "s|620x460|620x520|"                /home/${LIVE_USER}/.config/autostart/autostart.sh
      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
-- 
cgit v1.2.2