QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

archlinux: fix /etc/os-release and add remote qubes repository (on olivier.medoc.free.fr)

Browse Source
This commit is contained in:
Olivier MEDOC 2015-02-01 15:58:01 +01:00 committed by Marek Marczykowski-Górecki
parent d0bf2bc374
commit 86da3b44ce
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts_archlinux/04_install_qubes.sh
View File

@ -54,10 +54,24 @@ ln -s /etc/sysconfig/i18n $INSTALLDIR/etc/locale.conf
sed 's/#en_US/en_US/g' -i $INSTALLDIR/etc/locale.gen sed 's/#en_US/en_US/g' -i $INSTALLDIR/etc/locale.gen
./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "locale-gen" ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "locale-gen"
mkdir -p $INSTALLDIR/lib/modules
# Creating a random file in /lib/modules to ensure that the directory in never deleted when packages are removed # Creating a random file in /lib/modules to ensure that the directory in never deleted when packages are removed
mkdir -p $INSTALLDIR/lib/modules
touch $INSTALLDIR/lib/modules/QUBES touch $INSTALLDIR/lib/modules/QUBES
# Ensure os-release is setup correctly or Fedora dracut will fail when displaying the OS
# also ensure that the path is relative, because root is in /newroot before dracut switch root
ln -s ../usr/lib/os-release $INSTALLDIR/etc/os-release
# Disable qubes local repository
sed '/QubesTMP/d' -i $INSTALLDIR/etc/pacman.conf
# Reregistering qubes repository to the remote version
echo "--> Registering Qubes remote repository"
cat >> $INSTALLDIR/etc/pacman.conf <<EOF
[qubes]
Server = http://olivier.medoc.free.fr/archlinux/pkgs/
EOF
echo "--> Cleaning up..." echo "--> Cleaning up..."
umount $INSTALLDIR/mnt/qubes-rpms-mirror-repo umount $INSTALLDIR/mnt/qubes-rpms-mirror-repo
umount mnt_archlinux_dvd umount mnt_archlinux_dvd

3
scripts_archlinux/09_cleanup.sh
View File

@ -24,9 +24,6 @@ echo $VIDEOPKGS | ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --n
# Remove other font package # Remove other font package
./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc xorg-fonts-100dpi xorg-fonts-75dpi ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc xorg-fonts-100dpi xorg-fonts-75dpi
# Disable qubes local repository
sed '/QubesTMP/d' -i $INSTALLDIR/etc/pacman.conf
# Clean pacman cache # Clean pacman cache
./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Scc ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Scc