Updater fix path to rootfiles

Updater fix emergency initrd

diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
index b4c14b1c4bbdbae0cc4d68a62bbbac7167d9c389..1a952ee1e5868b0846b11038626ae6599f6778f6 100644 (file)
--- a/config/rootfiles/updater/filelists/core16
+++ b/config/rootfiles/updater/filelists/core16
@@ -1,4 +1,5 @@
 opt/pakfire/db/core/mine
+etc/mkinitcpio.conf
 etc/init.d/mISDN
 etc/init.d/squid
 etc/ppp/ip-up

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index b89b701759be3158f7737054d0a4065dfeed7a69..1ee2500829f81a383b702003b2ec54d81b89369e 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -47,10 +47,10 @@ fi
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
 # Add issue and packfire conf to backup
-echo etc/issue >> ROOTFILES
-echo opt/pakfire/etc/pakfire.conf >> ROOTFILES
+echo etc/issue >> /opt/pakfire/tmp/ROOTFILES
+echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
 tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
-   -T ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
+   -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
 echo
 echo Update IPfire to $NEWVERSON ...
 #
@@ -81,15 +81,15 @@ sed -i "s|/vmlinuz-ipfire|/vmlinuz-$OLDKERNEL-ipfire|g" /boot/grub/grub-old.conf
 #
 # Made emergency - initramdisk
 #
+echo
+echo Create new Initramdisks ...
 cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
 sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
-mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
 cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
 #
 # Made initramdisk
 #
-echo
-echo Create new Initramdisks ...
 if [ "${ROOT:0:7}" == "/dev/sd" ]; then
     # Remove ide hook if root is on sda 
     sed -i "s| ide | |g" /etc/mkinitcpio.conf