Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=5445f813559934c7966f4bea801171f93bb8e57e
commit 5445f813559934c7966f4bea801171f93bb8e57e
Author: Baste <ba...@frugalware.org>
Date: Sun Nov 13 13:18:45 2011 +0100
* Solve problem with kernel
diff --git a/bin/create-iso b/bin/create-iso
index 88e5ce3..95e5262 100755
--- a/bin/create-iso
+++ b/bin/create-iso
@@ -11,12 +11,7 @@ wget $MIRROR/frugalware-$TREE/boot/syslinux/isolinux.bin
wget $MIRROR/frugalware-$TREE/boot/syslinux/splash.png
wget $MIRROR/frugalware-$TREE/boot/syslinux/vesamenu.c32
cd -
-##Bug: Occasionally, the link vmlinuz is not present in /boot
-if [ -e $TREE/rootfs/boot/vmlinuz ]; then
- cp -v $TREE/rootfs/boot/vmlinuz $TREE/iso/boot/vmlinuz
-else
- cp -v $TREE/rootfs/boot/vmlinuz* $TREE/iso/boot/vmlinuz
-fi
+cp -v $TREE/rootfs/boot/vmlinuz $TREE/iso/boot/vmlinuz
cp -v $TREE/rootfs/boot/initrd.img.xz $TREE/iso/boot/initrd
umount $TREE/rootfs
cat >$TREE/iso/boot/syslinux/syslinux.cfg <<EOF
diff --git a/bin/create-rootfs b/bin/create-rootfs
index 953fe4e..fd56501 100755
--- a/bin/create-rootfs
+++ b/bin/create-rootfs
@@ -10,14 +10,13 @@ fi
## Check package needs for build
if [ "`pacman-g2 -Q squashfs &>/dev/null;echo $?`" != 0 ]; then
echo "Installing Squashfs"
- pacman-g2 -S squashfs --noconfirm
+ pacman-g2 -S squashfs --noconfirm
fi
if [ "`pacman-g2 -Q syslinux &>/dev/null;echo $?`" != 0 ]; then
echo "Installing Syslinux"
pacman-g2 -S syslinux --noconfirm
fi
-
# Mount loop
mkdir -p $CHROOTDIR
rm -f $TREE/rootfs.img
@@ -86,6 +85,8 @@ fi
echo "Server = $MIRROR/frugalware-$TREE/frugalware-$ARCH" >> pacman-g2.conf
eval PACKAGES=\$INST_${APPSGROUP}_APPS
pacman -Sy $PACKAGES -r "$CHROOTDIR" --noconfirm --config pacman-g2.conf
+## Solve problem with kernel
+pacman -Syf kernel -r "$CHROOTDIR" --noconfirm --config pacman-g2.conf
# Post-install tweaks
chroot $CHROOTDIR sh -c "echo 'root:$ROOTPASS' | chpasswd"
diff --git a/config.dev b/config.dev
index 7c3c22b..60a0a8f 100644
--- a/config.dev
+++ b/config.dev
@@ -48,7 +48,7 @@ USERNAME="fwlive"
USERPASS="fwlive"
# Additional packages to be installed by the profiles
-INST_MIN_APPS="base"
+INST_MIN_APPS="base fwife"
INST_GNOME_APPS="$INST_MIN_APPS gnome nano"
INST_KDE_APPS="$INST_MIN_APPS kde"
INST_XFCE_APPS="$INST_MIN_APPS xfce4 xfburn xarchiver geeqie xchat \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
