diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2017-12-22 10:45:41 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2018-01-01 00:53:38 -0500 |
commit | f119f660183875f5e525d263db91347e7a55e45f (patch) | |
tree | 891090be3c7f2b4ec7a6d9c0018815e42f639eda /configs/profile/root-image | |
parent | 87cdd9cdf061447f185a340262ea2e988d85028e (diff) |
squashme - revert empty isorepo
Diffstat (limited to 'configs/profile/root-image')
-rw-r--r-- | configs/profile/root-image/etc/pacman-offline.conf | 11 | ||||
-rw-r--r-- | configs/profile/root-image/etc/pacman-online.conf | 25 | ||||
l---------[-rw-r--r--] | configs/profile/root-image/etc/pacman.conf | 30 | ||||
-rwxr-xr-x | configs/profile/root-image/root/customize_root_image.sh | 8 |
4 files changed, 41 insertions, 33 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..cec8b80 100644..120000 --- a/configs/profile/root-image/etc/pacman.conf +++ b/configs/profile/root-image/etc/pacman.conf @@ -1,29 +1 @@ - -[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 +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 |