From 86da3b44ce12f055ef9b373d9c881250e49427c2 Mon Sep 17 00:00:00 2001
From: Olivier MEDOC <o_medoc@yahoo.fr>
Date: Sun, 1 Feb 2015 15:58:01 +0100
Subject: [PATCH] archlinux: fix /etc/os-release and add remote qubes
 repository (on olivier.medoc.free.fr)

---
 scripts_archlinux/04_install_qubes.sh | 16 +++++++++++++++-
 scripts_archlinux/09_cleanup.sh       |  3 ---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts_archlinux/04_install_qubes.sh b/scripts_archlinux/04_install_qubes.sh
index ae595c0..5153d71 100755
--- a/scripts_archlinux/04_install_qubes.sh
+++ b/scripts_archlinux/04_install_qubes.sh
@@ -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
 ./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
+mkdir -p $INSTALLDIR/lib/modules
 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..."
 umount $INSTALLDIR/mnt/qubes-rpms-mirror-repo
 umount mnt_archlinux_dvd
diff --git a/scripts_archlinux/09_cleanup.sh b/scripts_archlinux/09_cleanup.sh
index f47d8c6..4298b66 100755
--- a/scripts_archlinux/09_cleanup.sh
+++ b/scripts_archlinux/09_cleanup.sh
@@ -24,9 +24,6 @@ echo $VIDEOPKGS | ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --n
 # Remove other font package
 ./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
 ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Scc