Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=983c1e12bca0b540989c820bbf959afd21709cb9
commit 983c1e12bca0b540989c820bbf959afd21709cb9
Author: Janny <[EMAIL PROTECTED]>
Date: Sun Jan 27 12:16:07 2008 +0100
fwlive-correction
diff --git a/Makefile b/Makefile
index 7c694df..f48ac79 100644
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,14 @@ SETUPINITRDSIZE = echo "$$(($$(gzip --list $(SETUPINITRD)
|grep initrd-$(ARCH).i
endif
# needed files (files that we can't live without)
NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in rc.fsupd \
- crypt.c rc.fwlive rc.config configsave fileswap reboot.diff
services.diff udev.diff rc.S.diff \
+ crypt.c rc.fwlive rc.config configsave fileswap reboot.diff
services.diff rc.S.diff \
rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst
INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd
/usr/local/bin/configsave \
/usr/local/bin/fileswap /usr/local/bin/fstab-update /usr/local/bin/xstart \
/usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline
/tmp/live-base/tools/fpm2lzm
INST_FILES_644 = /etc/X11/xorg.conf /boot/grub/menu.lst
PWD = $(shell pwd)
-PATCH_FILES = reboot.diff services.diff udev.diff rc.S.diff
+PATCH_FILES = reboot.diff services.diff rc.S.diff
REMOVE_FILES = /etc/rc.d/rcS.d/S{19rc.bootclean,07rc.frugalware} \
/etc/rc.d/rc{3.d,4.d}/S{21rc.firewall,26rc.lmsensors,32rc.sshd,78rc.mysqld,80rc.postfix,81rc.courier-authlib,82rc.imapd,82rc.pop3d,85rc.httpd,95rc.crond,99rc.cups,99rc.mono,99cups,12rc.syslog,13rc.portmap,19rc.rmount,50rc.atd}
\
/etc/rc.d/rc0.d/K{00cups,01rc.cups,05rc.crond,60rc.atd,87rc.portmap,88rc.syslog,90rc.rmount,96rc.swap,98rc.interfaces,56rc.sshd,30rc.postfix}
\
@@ -41,6 +41,7 @@ all: checkroot check-tree checkfiles chroot-mkdirs
create-pkgdb cache-mount inst
check-tree:
source /etc/repoman.conf; \
grep -v Include /etc/pacman-g2.conf >${PACCONF}; \
+<<<<<<< HEAD:Makefile
echo "[janny]" >> ${PACCONF}; \
echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive/frugalware-i686/"; >>
${PACCONF}; \
if [ ${APPSGROUP} == TEST ] ; then \
@@ -49,9 +50,17 @@ check-tree:
echo "[playground]" >> ${PACCONF}; \
echo "Server =
http://ftp.frugalware.org/pub/other/people/crazy/playground/frugalware-i686"; >>
${PACCONF}; \
fi
+=======
+ echo "[fwlive_pkgs]" >> ${PACCONF}; \
+ echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive_pkgs/frugalware-i686/";
>> ${PACCONF}; \
+>>>>>>> fwlive-0.8rc1
+ * version bump at rc1
+ * change packages repo at fwlive_pkgs
+ * remove unnecessary udev.diff
+ * add copy2ram and failsafe title to menu.lst:Makefile
if [ ${APPSGROUP} == "KDE4" ] ; then \
echo "[playground]" >> ${PACCONF}; \
- echo "Server =
http://ftp.frugalware.org/pub/other/people/crazy/playground/frugalware-i686"; >>
${PACCONF}; \
+ echo "Server =
http://ftp.frugalware.org/pub/other/people/crazy/playground/frugalware-i686/";
>> ${PACCONF}; \
fi
for i in `echo ${TREE}|sed 's/,/ /g'`; do \
repo=$$(eval "echo \$${$${i}_fdb/.fdb}"); \
diff --git a/config b/config
index f24a703..37632ea 100644
--- a/config
+++ b/config
@@ -24,7 +24,15 @@ FWLFONT = lat2-16.psfu.gz
# * SERVER
# * MIN - comfortable console workstation
# * MUSTHAVE - minimalistic one, base of all profiles
+<<<<<<< HEAD:config
APPSGROUP = TEST
+=======
+APPSGROUP = MUSTHAVE
+>>>>>>> fwlive-0.8rc1
+ * version bump at rc1
+ * change packages repo at fwlive_pkgs
+ * remove unnecessary udev.diff
+ * add copy2ram and failsafe title to menu.lst:config
# grub title part 1
FWLSREL = FWLive-${APPSGROUP}
@@ -35,7 +43,7 @@ FWVER = $(shell date +%Y%m%d)
FWCODENAME = -current
endif
ifeq ($(findstring testing,$(TREE)),testing)
-FWVER = 0.8pre2
+FWVER = 0.8rc1
FWCODENAME = Kalgan
endif
FWVER ?= 0.7
@@ -67,11 +75,11 @@ SAVEDIRS = etc home lib root usr var
CONFIG_SETUP = y
# additional packages to be installed by the profiles
+# no builded pkgs: rt2500-fwlive rt2400-fwlive acx100-fwlive
DRIVERS = ndiswrapper-fwlive ipw2200-firmware gspcav1-fwlive \
- qc-usb-fwlive cdemu-fwlive truecrypt-fwlive dazuko-fwlive \
+ qc-usb-fwlive truecrypt-fwlive dazuko-fwlive \
busybox-fwlive lirc-fwlive acerhk-fwlive madwifi-fwlive \
- wlan-ng-fwlive acx100-fwlive adm8211-fwlive ipw3945-fwlive \
- rt2500-fwlive rt2400-fwlive rtl8110-fwlive kqemu-fwlive
+ wlan-ng-fwlive adm8211-fwlive ipw3945-fwlive kqemu-fwlive
INST_MUSTHAVE_APPS = busybox-fwlive util-linux grub-theme-fwlive \
sudo aufs squashfs cdrtools ntfs-3g
ifneq ($(ARCH),x86_64)
diff --git a/menu.lst b/menu.lst
index 3293964..b51cf1d 100644
--- a/menu.lst
+++ b/menu.lst
@@ -6,6 +6,14 @@ title @GRUBTITLE@
kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram
initrd /boot/initrd.gz
+title @GRUBTITLE@ Copy to RAM
+ kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram noresume
copy2ram
+ initrd /boot/initrd.gz
+
+title @GRUBTITLE@ Failsafe
+ kernel /boot/vmlinuz initrd=/boot/initrd.gz init=linuxrc max_loop=255
load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=19742 rw root=/dev/ram showopts
ide=nodma apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp
noapic maxcpus=0
+ initrd /boot/initrd.gz
+
title Memtest86+
kernel /boot/memtest.bin
diff --git a/services.diff b/services.diff
index 390c9b1..0bfb08f 100644
--- a/services.diff
+++ b/services.diff
@@ -1,7 +1,18 @@
diff -Naur var.orig/lib/frugalware/system/service
var/lib/frugalware/system/service
---- var.orig/lib/frugalware/system/service 2006-11-07 07:29:41.000000000
+0100
-+++ var/lib/frugalware/system/service 2006-11-07 07:27:30.000000000 +0100
-@@ -35,6 +35,10 @@
+--- var.orig/lib/frugalware/system/service 2008-01-27 08:39:02.000000000
+0100
++++ var/lib/frugalware/system/service 2008-01-27 08:43:20.000000000 +0100
+@@ -30,6 +30,10 @@
+ echo $"del Removes a service from chkconfig management."
+ echo
+ echo $"list List whether the service is stopped or started in
each runlevel."
++ echo
++ echo $"save Save config settings. Only in service config."
++ echo
++ echo $"restore Restore saved settings. Only in service config."
+ exit 0
+ fi
+ if [ "$1" = "list" ]; then
+@@ -60,5 +64,9 @@
chkconfig --del $service
elif [ "$2" = "list" ]; then
chkconfig --list $service
@@ -9,14 +20,5 @@ diff -Naur var.orig/lib/frugalware/system/service
var/lib/frugalware/system/serv
+ $name save
+elif [ "$2" = "restore" ]; then
+ $name restore
- else # help
- echo "service 0.1 (C) 2003-2004 Vajna Miklos"
- echo
-@@ -47,5 +51,7 @@
- echo $"add Adds a new service for management by chkconfig."
- echo $"del Removes a service from chkconfig management."
- echo $"list List whether the service is stopped or started in
each runlevel."
-+ echo $"save Save config settings. Only in service config."
-+ echo $"restore Restore saved settings. Only in service config."
fi
fi
diff --git a/udev.diff b/udev.diff
deleted file mode 100644
index cb00fef..0000000
--- a/udev.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur etc.orig/rc.d/rc.udev etc/rc.d/rc.udev
---- etc.orig/rc.d/rc.udev 2006-10-21 10:02:47.000000000 +0000
-+++ etc/rc.d/rc.udev 2006-11-08 18:39:40.000000000 +0000
-@@ -11,7 +11,7 @@
- # Thanks go out to the Gentoo developers for proving
- # that this is possible to do.
-
--mount / -o rw,remount
-+#mount / -o rw,remount
- mount none -t sysfs /sys
-
- . /etc/udev/udev.conf
-@@ -110,6 +110,6 @@
- else
- echo "/sbin/udevsend" > /proc/sys/kernel/hotplug
- fi
--mount / -o ro,remount
-+mount / -o ro,remount > /dev/null 2>&1
-
- # end of rc.udev
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
