[Lunar-commits] <moonbase> Revert "Revert "OK""

Florin Braescu florin at lunar-linux.org
Sun Jul 6 15:41:16 CEST 2008


commit 1a23f121cfba622d9ac04a85b0ad8c5a017a20ae
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jul 6 16:41:16 2008 +0300

    Revert "Revert "OK""
    
    This reverts commit 842f7d36000752c7bd852d2b7b9a1c5b3951501c.
    
    remove this local stuff.
---
 zlocal/libffi/BUILD                       |    6 ------
 zlocal/libffi/DETAILS                     |   15 ---------------
 zlocal/mktemp/CONFLICTS                   |    1 -
 zlocal/mktemp/DETAILS                     |   28 ----------------------------
 zlocal/upstart/BUILD                      |   15 ---------------
 zlocal/upstart/DETAILS                    |   26 --------------------------
 zlocal/upstart/event.d/control-alt-delete |    8 --------
 zlocal/upstart/event.d/hostname           |   24 ------------------------
 zlocal/upstart/event.d/rc-default         |   26 --------------------------
 zlocal/upstart/event.d/rc0                |   25 -------------------------
 zlocal/upstart/event.d/rc1                |   20 --------------------
 zlocal/upstart/event.d/rc2                |   20 --------------------
 zlocal/upstart/event.d/rc3                |   20 --------------------
 zlocal/upstart/event.d/rc4                |   20 --------------------
 zlocal/upstart/event.d/rc5                |   20 --------------------
 zlocal/upstart/event.d/rc6                |   23 -----------------------
 zlocal/upstart/event.d/rcS                |   20 --------------------
 zlocal/upstart/event.d/rcS-sulogin        |   24 ------------------------
 zlocal/upstart/event.d/sulogin            |   20 --------------------
 zlocal/upstart/event.d/tty1               |   16 ----------------
 zlocal/upstart/event.d/tty2               |   16 ----------------
 zlocal/upstart/event.d/tty3               |   16 ----------------
 zlocal/upstart/event.d/tty4               |   16 ----------------
 zlocal/upstart/event.d/tty5               |   16 ----------------
 zlocal/upstart/event.d/tty6               |   16 ----------------
 25 files changed, 0 insertions(+), 457 deletions(-)

diff --git a/zlocal/libffi/BUILD b/zlocal/libffi/BUILD
deleted file mode 100644
index 0e11842..0000000
--- a/zlocal/libffi/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-
-  sedit "s:\$(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include:/usr/include:" include/Makefile.am include/Makefile.in
-  default_build
-
-) > $C_FIFO 2>&1
diff --git a/zlocal/libffi/DETAILS b/zlocal/libffi/DETAILS
deleted file mode 100644
index 249578a..0000000
--- a/zlocal/libffi/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=libffi
-         VERSION=3.0.4
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=ftp://sourceware.org/pub/libffi
-      SOURCE_VFY=sha1:7752d40fc3cca3a47d044ce387eb43d29da8f909
-        WEB_SITE=http://sourceware.org/libffi
-         ENTERED=20080225
-         UPDATED=20080225
-           SHORT="A portable, high level programming interface"
-
-cat << EOF
-The libffi library provides a portable, high level programming interface 
-to various calling conventions. This allows a programmer to call any 
-function specified by a call interface description at run-time.
-EOF
diff --git a/zlocal/mktemp/CONFLICTS b/zlocal/mktemp/CONFLICTS
deleted file mode 100644
index d1088f4..0000000
--- a/zlocal/mktemp/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts coreutils
diff --git a/zlocal/mktemp/DETAILS b/zlocal/mktemp/DETAILS
deleted file mode 100644
index cdfaf37..0000000
--- a/zlocal/mktemp/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           MODULE=mktemp
-         VERSION=1.5
-          SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=ftp://ftp.mktemp.org/pub/mktemp/
-   SOURCE_URL[1]=ftp://ftp.courtesan.com/pub/mktemp/
-        WEB_SITE=http://www.mktemp.org/
-         ENTERED=20020307
-         UPDATED=20040707
-           SHORT="simple utility designed to make temporary file handling in shells scripts be safe and simple."
-cat << EOF
-What/why is mktemp?
-===================
-Mktemp is a simple utility designed to make temporary file handling
-in shells scripts be safe and simple.  Traditionally, people writing
-shell scripts have used constructs like:
-
-    TFILE=/tmp/foop.$$
-
-which are trivial to attack.  If such a script is run as root it may
-be possible for an attacker on the local host to gain access to the
-root login, corrupt or unlink system files, or do a variety of other
-nasty things.
-
-The basic problem is that most shells have no equivalent to open(2)'s
-O_EXCL flag.  While it is possible to avoid this using temporary
-directories, I consider the use of mktemp(1) to be superior both in terms
-of simplicity and robustness.  See the man page for more information.
-EOF
diff --git a/zlocal/upstart/BUILD b/zlocal/upstart/BUILD
deleted file mode 100644
index e8e2635..0000000
--- a/zlocal/upstart/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-  ./configure  --build=$BUILD            \
-               --prefix=/usr             \
-	       --sbindir=/sbin           \
-               --sysconfdir=/etc         \
-               --localstatedir=/var      \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man   \
-               $OPTS                    &&
-
-  default_make  &&
-  
-  cp -f $SCRIPT_DIRECTORY/event.d/* /etc/event.d/
-
-) > $C_FIFO 2>&1
diff --git a/zlocal/upstart/DETAILS b/zlocal/upstart/DETAILS
deleted file mode 100644
index 901b935..0000000
--- a/zlocal/upstart/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
-          MODULE=upstart
-         VERSION=0.3.9
-          SOURCE=$MODULE-${VERSION}.tar.bz2
-      SOURCE_URL=http://upstart.ubuntu.com/download/0.3
-      SOURCE_VFY=sha1:1e105296e8bdd269ac211bec46f03d423a13d68f
-        WEB_SITE=http://upstart.ubuntu.com
-         ENTERED=20080323
-         UPDATED=20080323
-           SHORT="An event-based replacement for the /sbin/init daemon"
-
-cat << EOF
-Upstart is an event-based replacement for the /sbin/init daemon which
-handles starting of tasks and services during boot, stopping them
-during shutdown and supervising them while the system is running.
-It is intended to be suitable for deployment in all Linux
-distributions as a replacement for the venerable sysvinit package.
-Feature highlights:
- * tasks and Services are started and stopped by events;
- * events are generated as tasks and services are run and stopped;
- * events may also be generated at timed intervals, or when files are
-   changed (not yet implemented);
- * events may be received from any other process on the system;
- * services may be respawned if they die unexpectedly
- * bi-directional communication with init daemon to discover which
-   jobs are running, why jobs failed, etc.
-EOF
diff --git a/zlocal/upstart/event.d/control-alt-delete b/zlocal/upstart/event.d/control-alt-delete
deleted file mode 100644
index 35cb130..0000000
--- a/zlocal/upstart/event.d/control-alt-delete
+++ /dev/null
@@ -1,8 +0,0 @@
-# control-alt-delete - emergency keypress handling
-#
-# This task is run whenever the Control-Alt-Delete key combination is
-# pressed.  Usually used to shut down the machine.
-
-start on control-alt-delete
-
-exec /sbin/shutdown -r now "Control-Alt-Delete pressed"
diff --git a/zlocal/upstart/event.d/hostname b/zlocal/upstart/event.d/hostname
deleted file mode 100644
index 913e866..0000000
--- a/zlocal/upstart/event.d/hostname
+++ /dev/null
@@ -1,24 +0,0 @@
-description	"Set the hostname"
-author		"Scott James Remnant"
-
-start on startup
-
-console output
-script
-    if [ -f /etc/hostname ]; then
-	HOSTNAME="$(cat /etc/hostname)"
-    fi
-
-    # Keep current name if /etc/hostname is missing.
-    if [ -z "$HOSTNAME" ]; then
-	HOSTNAME="$(hostname)"
-    fi
-
-    # And set it to 'localhost' if no setting was found
-    if [ -z "$HOSTNAME" ]; then
-	HOSTNAME=localhost
-    fi
-
-    echo "Setting hostname to '$HOSTNAME'"
-    hostname "$HOSTNAME"
-end script
diff --git a/zlocal/upstart/event.d/rc-default b/zlocal/upstart/event.d/rc-default
deleted file mode 100644
index 133e997..0000000
--- a/zlocal/upstart/event.d/rc-default
+++ /dev/null
@@ -1,26 +0,0 @@
-# rc - runlevel compatibility
-#
-# This task guesses what the "default runlevel" should be and starts the
-# appropriate script.
-
-start on stopped rcS
-
-script
-	runlevel --reboot || true
-
-	if grep -q -w -- "-s\|single\|S" /proc/cmdline; then
-	    telinit S
-	elif [ -r /etc/inittab ]; then
-	    RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
-	    if [ -n "$RL" ]; then
-		telinit $RL
-	    else
-		telinit 2
-	    fi
-	else
-	    telinit 2
-	fi
-	
-	/etc/init.d/bootmisc
-	
-end script
diff --git a/zlocal/upstart/event.d/rc0 b/zlocal/upstart/event.d/rc0
deleted file mode 100644
index d534826..0000000
--- a/zlocal/upstart/event.d/rc0
+++ /dev/null
@@ -1,25 +0,0 @@
-# rc0 - runlevel 0 compatibility
-#
-# This task runs the old sysv-rc runlevel 0 ("halt/poweroff") scripts with
-# the decision as to whether to halt or power off the system left up to the
-# script (and thus /etc/default/poweroff).
-
-start on runlevel 0
-
-stop on runlevel [!0]
-
-console output
-script
-	set $(runlevel || true)
-	if [ "$2" != "0" ] && [ "$2" != "6" ]; then
-	    set $(runlevel --set 0 || true)
-        fi
-
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 0
-end script
diff --git a/zlocal/upstart/event.d/rc1 b/zlocal/upstart/event.d/rc1
deleted file mode 100644
index 8629369..0000000
--- a/zlocal/upstart/event.d/rc1
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc1 - runlevel 1 compatibility
-#
-# This task runs the old sysv-rc runlevel 4 (user defined) scripts. It
-# is usually started by the telinit compatibility wrapper.
-
-start on runlevel 1
-
-stop on runlevel [!1]
-
-console output
-script
-	set $(runlevel --set 1 || true)
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 1
-end script
diff --git a/zlocal/upstart/event.d/rc2 b/zlocal/upstart/event.d/rc2
deleted file mode 100644
index b30ad7a..0000000
--- a/zlocal/upstart/event.d/rc2
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc2 - runlevel 2 compatibility
-#
-# This task runs the old sysv-rc runlevel 2 ("multi-user") scripts. It
-# is usually started by the telinit compatibility wrapper.
-
-start on runlevel 2
-
-stop on runlevel [!2]
-
-console output
-script
-	set $(runlevel --set 2 || true)
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 2
-end script
diff --git a/zlocal/upstart/event.d/rc3 b/zlocal/upstart/event.d/rc3
deleted file mode 100644
index d9a22b9..0000000
--- a/zlocal/upstart/event.d/rc3
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc3 - runlevel 3 compatibility
-#
-# This task runs the old sysv-rc runlevel 3 (user defined) scripts. It
-# is usually started by the telinit compatibility wrapper.
-
-start on runlevel 3
-
-stop on runlevel [!3]
-
-console output
-script
-	set $(runlevel --set 3 || true)
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 3
-end script
diff --git a/zlocal/upstart/event.d/rc4 b/zlocal/upstart/event.d/rc4
deleted file mode 100644
index f4eca3c..0000000
--- a/zlocal/upstart/event.d/rc4
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc4 - runlevel 4 compatibility
-#
-# This task runs the old sysv-rc runlevel 4 (user defined) scripts. It
-# is usually started by the telinit compatibility wrapper.
-
-start on runlevel 4
-
-stop on runlevel [!4]
-
-console output
-script
-	set $(runlevel --set 4 || true)
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 4
-end script
diff --git a/zlocal/upstart/event.d/rc5 b/zlocal/upstart/event.d/rc5
deleted file mode 100644
index 0544730..0000000
--- a/zlocal/upstart/event.d/rc5
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc5 - runlevel 5 compatibility
-#
-# This task runs the old sysv-rc runlevel 5 (user defined) scripts. It
-# is usually started by the telinit compatibility wrapper.
-
-start on runlevel 5
-
-stop on runlevel [!5]
-
-console output
-script
-	set $(runlevel --set 5 || true)
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 5
-end script
diff --git a/zlocal/upstart/event.d/rc6 b/zlocal/upstart/event.d/rc6
deleted file mode 100644
index e3bfdaa..0000000
--- a/zlocal/upstart/event.d/rc6
+++ /dev/null
@@ -1,23 +0,0 @@
-# rc6 - runlevel 6 compatibility
-#
-# This task runs the old sysv-rc runlevel 6 ("reboot") scripts.
-
-start on runlevel 6
-
-stop on runlevel [!6]
-
-console output
-script
-	set $(runlevel || true)
-	if [ "$2" != "0" ] && [ "$2" != "6" ]; then
-	    set $(runlevel --set 6 || true)
-        fi
-
-	if [ "$1" != "unknown" ]; then
-	    PREVLEVEL=$1
-	    RUNLEVEL=$2
-	    export PREVLEVEL RUNLEVEL
-	fi
-
-	exec /etc/init.d/rc 6
-end script
diff --git a/zlocal/upstart/event.d/rcS b/zlocal/upstart/event.d/rcS
deleted file mode 100644
index 406c247..0000000
--- a/zlocal/upstart/event.d/rcS
+++ /dev/null
@@ -1,20 +0,0 @@
-# rcS - runlevel compatibility
-#
-# This task runs the old sysv-rc startup scripts.
-
-start on startup
-
-stop on runlevel
-
-# Note: there can be no previous runlevel here, if we have one it's bad
-# information (we enter rc1 not rcS for maintenance).
-console output
-script
-	runlevel --set S >/dev/null || true
-
-	PREVLEVEL=N
-	RUNLEVEL=S
-	export PREVLEVEL RUNLEVEL
-
-	exec /etc/init.d/rcS
-end script
diff --git a/zlocal/upstart/event.d/rcS-sulogin b/zlocal/upstart/event.d/rcS-sulogin
deleted file mode 100644
index 5807779..0000000
--- a/zlocal/upstart/event.d/rcS-sulogin
+++ /dev/null
@@ -1,24 +0,0 @@
-# rcS-sulogin - "single-user" runlevel compatibility
-#
-# This task runs the sulogin binary during "single-user" mode.
-
-start on runlevel S
-
-stop on runlevel
-
-console owner
-script
-	runlevel --set S >/dev/null || true
-	/sbin/sulogin
-
-	if [ -r /etc/inittab ]; then
-	    RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}" /etc/inittab || true)"
-	    if [ -n "$RL" ]; then
-		telinit $RL
-	    else
-		telinit 2
-	    fi
-	else
-	    telinit 2
-	fi
-end script
diff --git a/zlocal/upstart/event.d/sulogin b/zlocal/upstart/event.d/sulogin
deleted file mode 100644
index 144ea27..0000000
--- a/zlocal/upstart/event.d/sulogin
+++ /dev/null
@@ -1,20 +0,0 @@
-# sulogin - rescue mode
-#
-# This task ensures that should the system fail to have any active jobs
-# that the system administrator can rescue it; by giving them a shell.
-
-# Disabled since this would get started when init is re-exec'd, and
-# "console owner" kills X.
-# start on stalled
-
-exec /sbin/sulogin
-console owner
-
-pre-start script
-	echo
-	echo "The system has reached a state where there are no jobs running."
-	echo "A shell will be spawned so that you may start such jobs that are"
-	echo "necessary."
-	echo
-	echo "Type 'exit' when finished."
-end script
diff --git a/zlocal/upstart/event.d/tty1 b/zlocal/upstart/event.d/tty1
deleted file mode 100644
index e9700d6..0000000
--- a/zlocal/upstart/event.d/tty1
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty1 - agetty
-#
-# This service maintains an agetty on tty1 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-start on runlevel 4
-start on runlevel 5
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty1
diff --git a/zlocal/upstart/event.d/tty2 b/zlocal/upstart/event.d/tty2
deleted file mode 100644
index bc54d70..0000000
--- a/zlocal/upstart/event.d/tty2
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty2 - agetty
-#
-# This service maintains an agetty on tty2 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty2
diff --git a/zlocal/upstart/event.d/tty3 b/zlocal/upstart/event.d/tty3
deleted file mode 100644
index e676fb8..0000000
--- a/zlocal/upstart/event.d/tty3
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty3 - agetty
-#
-# This service maintains an agetty on tty3 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty3
diff --git a/zlocal/upstart/event.d/tty4 b/zlocal/upstart/event.d/tty4
deleted file mode 100644
index 9b0ec98..0000000
--- a/zlocal/upstart/event.d/tty4
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty4 - agetty
-#
-# This service maintains an agetty on tty4 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty4
diff --git a/zlocal/upstart/event.d/tty5 b/zlocal/upstart/event.d/tty5
deleted file mode 100644
index 079665c..0000000
--- a/zlocal/upstart/event.d/tty5
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty5 - agetty
-#
-# This service maintains an agetty on tty5 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty5
diff --git a/zlocal/upstart/event.d/tty6 b/zlocal/upstart/event.d/tty6
deleted file mode 100644
index 4ff4972..0000000
--- a/zlocal/upstart/event.d/tty6
+++ /dev/null
@@ -1,16 +0,0 @@
-# tty6 - agetty
-#
-# This service maintains an agetty on tty6 from the point the system is
-# started until it is shut down again.
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /sbin/agetty 38400 tty6


More information about the Lunar-commits mailing list