From f0c24df5d85bafe7f5f3504ee56a4db758f6b45a Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Fri, 25 Jan 2008 22:37:22 -0500 Subject: [PATCH] Removed more superfluous ""s and ''s --- base/sysfiles/etc_conf_pci.txt | 25 +++++++++---------------- base/sysfiles/etc_conf_usb.txt | 25 +++++++++---------------- base/sysvinit/system.init | 4 ++-- e17/entrance/entrance.postinstall | 9 +++++---- filesystem/autofs/autofs.init | 9 +++++---- powerpc/pmud/pmud.init | 9 +++++---- powerpc/powerpc-utils/mac_hid.init | 9 +++++---- security/rsbac/rsbac.desc | 4 ++-- 8 files changed, 42 insertions(+), 52 deletions(-) diff --git a/base/sysfiles/etc_conf_pci.txt b/base/sysfiles/etc_conf_pci.txt index bf45ab1c9..d305d65b4 100644 --- a/base/sysfiles/etc_conf_pci.txt +++ b/base/sysfiles/etc_conf_pci.txt @@ -1,31 +1,24 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/*/sysfiles/etc_conf_pci.txt +# Filename: package/.../sysfiles/etc_conf_pci.txt +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # +# More information can be found in the files COPYING and README. +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- # # This file contains the configuration for ROCK-Plug, # and the PCI subsystem. # Static list of PCI modules # These modules will be loaded on init. -PCI_MODULES="" +PCI_MODULES= # Modules to be skipped # These modules are never loaded, whether on init diff --git a/base/sysfiles/etc_conf_usb.txt b/base/sysfiles/etc_conf_usb.txt index 3f5c45a46..760890e74 100644 --- a/base/sysfiles/etc_conf_usb.txt +++ b/base/sysfiles/etc_conf_usb.txt @@ -1,24 +1,17 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/*/sysfiles/etc_conf_usb.txt +# Filename: package/.../sysfiles/etc_conf_usb.txt +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # +# More information can be found in the files COPYING and README. +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- # # This file contains the configuration for ROCK-Plug, # and the USB subsystem. @@ -26,7 +19,7 @@ # Static list of USB modules # These modules will be loaded on init. # (for XFree add "mousedev input") -USB_MODULES="" +USB_MODULES= # Modules to be skipped # These modules are never loaded, whether on init diff --git a/base/sysvinit/system.init b/base/sysvinit/system.init index 078828791..9de7d8421 100644 --- a/base/sysvinit/system.init +++ b/base/sysvinit/system.init @@ -4,7 +4,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../sysvinit/system.init -# Copyright (C) 2006 - 2007 The OpenSDE Project +# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -186,7 +186,7 @@ dnl dnl block_split() if [ "$INIT_DOES_REBOOTHALT" != "1" ]; then - command="" + command= [ "$RUNLEVEL" = 0 ] && command=halt [ "$RUNLEVEL" = 6 ] && command=reboot if [ -n "$command" ] ; then diff --git a/e17/entrance/entrance.postinstall b/e17/entrance/entrance.postinstall index 7d6c3e382..b3d7b7d1a 100644 --- a/e17/entrance/entrance.postinstall +++ b/e17/entrance/entrance.postinstall @@ -1,8 +1,9 @@ #!/bin/sh -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../entrance/entrance.postinstall +# Filename: package/.../entrance/entrance.postinstall +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -11,7 +12,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- s=0 @@ -27,7 +28,7 @@ for x in /usr/share/rock-registry/wm/* ; do ecore_config -c /etc/opt/e17/entrance_config.cfg -k /entrance/session/$s/session -s $exec # match entrance icon - icon="" + icon= case "$short" in kde*) icon=kde ;; *nome*) icon=gnome ;; diff --git a/filesystem/autofs/autofs.init b/filesystem/autofs/autofs.init index b1f4885e3..f7b67e6ed 100644 --- a/filesystem/autofs/autofs.init +++ b/filesystem/autofs/autofs.init @@ -1,9 +1,10 @@ #!/bin/sh # -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../autofs/autofs.init +# Filename: package/.../autofs/autofs.init +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -13,7 +14,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- # # Desc: Kernel Automounter Daemon # Runlevel: 74 rcX @@ -25,7 +26,7 @@ export PATH # We can add local options here # e.g. localoptions='rsize=8192,wsize=8192' # -localoptions='' +localoptions= function getmounts() { diff --git a/powerpc/pmud/pmud.init b/powerpc/pmud/pmud.init index 4ffbc41ac..d1ca905ff 100644 --- a/powerpc/pmud/pmud.init +++ b/powerpc/pmud/pmud.init @@ -1,9 +1,10 @@ #!/bin/sh # -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../pmud/pmud.init +# Filename: package/.../pmud/pmud.init +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -13,13 +14,13 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- # # Desc: PowerPC Power Management Unit daemon # Runlevel: 80 rcX # -PMUD_ARGS="" +PMUD_ARGS= [ -f /etc/conf/pmud ] && . /etc/conf/pmud diff --git a/powerpc/powerpc-utils/mac_hid.init b/powerpc/powerpc-utils/mac_hid.init index 561f9a198..b9e08226e 100644 --- a/powerpc/powerpc-utils/mac_hid.init +++ b/powerpc/powerpc-utils/mac_hid.init @@ -1,9 +1,10 @@ #!/bin/sh # -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../powerpc-utils/mac_hid.init +# Filename: package/.../powerpc-utils/mac_hid.init +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -13,7 +14,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- # # Desc: macintosh mouse button emulation # Runlevel: 35 rcX rc2 rc3 rc4 rc5 @@ -34,7 +35,7 @@ main_begin block_end block_begin(stop, `Stopping gpm.') - nop="" + nop= block_end main_end diff --git a/security/rsbac/rsbac.desc b/security/rsbac/rsbac.desc index 717548b82..aba96b700 100644 --- a/security/rsbac/rsbac.desc +++ b/security/rsbac/rsbac.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../rsbac/rsbac.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -42,7 +42,7 @@ [O] pkg_rsbac_lx24="\(1\|.*-2\.4\)" [O] pkg_rsbac_lx26="\(1\|.*-2\.6\)" -[O] pkg_rsbac_patches="" +[O] pkg_rsbac_patches= [D] 147739465 rsbac-admin-1.2.8.tar.bz2 http://download.rsbac.org/code/1.2.8/ [D] 1021945420 rsbac-common-1.2.8.tar.bz2 http://download.rsbac.org/code/1.2.8/