From 7bc1b6acaeeec978502c6d768f4f440a86a8e11c Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 1 Aug 2007 15:04:47 +0000 Subject: [PATCH] Udev-Tools letztendlich auch im Installationssystem bauen lassen. IPFireSeeder-Post-Install-Fix. Pakfire laesst sich nur aufrufen, wenn man auch "online" ist. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@730 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/udev | 6 ++++++ src/pakfire/pakfire | 5 +++++ src/paks/ipfireseeder/install.sh | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lfs/udev b/lfs/udev index ca5bad7a4..1fc23e5da 100644 --- a/lfs/udev +++ b/lfs/udev @@ -87,6 +87,12 @@ ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install rm -f /install/initrd/sbin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev* cd $(DIR_APP) && install udevstart udevinfo udevd udevsettle udevtrigger /install/initrd/sbin + cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ + extras/firmware extras/floppy extras/path_id \ + extras/scsi_id extras/usb_id extras/volume_id" + cd $(DIR_APP) && make DESTDIR=/install/initrd EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ + extras/firmware extras/floppy extras/path_id \ + extras/scsi_id extras/usb_id extras/volume_id" install cd /install/initrd/usr/share && rm -rf man cd /install/initrd/dev && rm -f console cd /install/initrd/dev && mknod -m 0600 console c 5 1 diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 73673d7a1..ef9e427d4 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -16,6 +16,11 @@ exit 1; } + unless ( -e "/var/ipfire/red/active" ) { + &Pakfire::message("PAKFIRE ERROR: You need to be online to run pakfire!"); + exit 2; + } + ### Check if we are started by another name # if ( $0 =~ /pakfire-update$/ ) { diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh index 97dd08cf7..540b40579 100644 --- a/src/paks/ipfireseeder/install.sh +++ b/src/paks/ipfireseeder/install.sh @@ -2,4 +2,4 @@ . /opt/pakfire/lib/functions.sh extract_files -/etc/init.d/ipfireseeder start +(sleep 600 & /etc/init.d/ipfireseeder start) & -- 2.39.2