From 720a42aed94906ed9c3437780a6700ad4882bcce Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Mon, 8 Aug 2005 15:58:45 -0500 Subject: [PATCH] lsb 3.0-3 Debian release. --- debian/README.Debian | 7 +- debian/changelog | 15 +++ debian/control | 1 + debian/doc-base.lsb-core | 10 -- debian/docs | 0 debian/lsb-core.docs | 1 - html/DEBtoLSB | 63 ------------- html/LSBtoDEB | 193 --------------------------------------- html/deblist | 49 ---------- html/depends | 9 -- html/fresh.common | 44 --------- html/fresh.extra | 129 -------------------------- html/fresh.new | 5 - html/freshinstall | 173 ----------------------------------- html/index.html | 48 ---------- html/needed | 14 --- html/super.extra | 138 ---------------------------- html/superset | 187 ------------------------------------- init-functions | 40 ++++++-- lsbinstall | 2 +- 20 files changed, 53 insertions(+), 1075 deletions(-) delete mode 100644 debian/doc-base.lsb-core delete mode 100644 debian/docs delete mode 100644 debian/lsb-core.docs delete mode 100644 html/DEBtoLSB delete mode 100644 html/LSBtoDEB delete mode 100644 html/deblist delete mode 100644 html/depends delete mode 100644 html/fresh.common delete mode 100644 html/fresh.extra delete mode 100644 html/fresh.new delete mode 100644 html/freshinstall delete mode 100644 html/index.html delete mode 100644 html/needed delete mode 100644 html/super.extra delete mode 100644 html/superset diff --git a/debian/README.Debian b/debian/README.Debian index fda8282..3cbb760 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -53,9 +53,8 @@ IMPLEMENTATION ISSUES This package attempts to implement the core LSB specification. Much of the implementation is drawn on a talk by Wichert Akkerman (http://www.liacs.nl/~wichert/talks/LSBDistro/html/) and Matt -Taggart's discussion of LSB 1.0 and Debian. Matt's discussion is -provided in the /usr/share/doc/lsb/html directory. Matt has also -produced a slideshow on LSB in Debian, which can be found at: +Taggart's discussion of LSB 1.0 and Debian. Matt has also produced a +slideshow on LSB in Debian, which can be found at: http://people.debian.org/~taggart/debconf2/ This package implements the LSB specification by: @@ -188,6 +187,6 @@ any reports of its success or failure. An example init script that tests some of these features is provided as /usr/share/doc/lsb/examples/init-skeleton. - -- Chris Lawrence , Mon Jul 11 18:55:39 2005 + -- Chris Lawrence , Mon Aug 8 15:47:37 2005 LocalWords: LSB diff --git a/debian/changelog b/debian/changelog index 4db4040..8ee206c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +lsb (3.0-3) unstable; urgency=low + + * Upload to unstable, since glibc 2.3.5 is now in. + * lsb-base is now Priority: important. + * Fix $FANCYTTY tests in a more POSIXly-correct way. (Closes: #322022) + * Get rid of the html/* stuff and references to it in README.Debian. + (Closes: #321260) + * Maintainers who are using the lsb-base logging facilities should + *strongly* consider using log_daemon_msg() instead of log_start_msg(); + the new log_daemon_msg() is designed to meet both Debian and Ubuntu + logging requirements. Customization should come in a subsequent 3.0-x + release. + + -- Chris Lawrence Mon, 8 Aug 2005 15:58:45 -0500 + lsb (3.0-2) experimental; urgency=low * Uploaded to experimental since glibc 2.3.5 is not in sid yet. diff --git a/debian/control b/debian/control index 7784109..9aade0b 100644 --- a/debian/control +++ b/debian/control @@ -96,6 +96,7 @@ Architecture: all Depends: sed, ncurses-bin Replaces: lsb (<< 2.0-6) Conflicts: lsb (<< 2.0-6) +Priority: important Description: Linux Standard Base 3.0 init script functionality The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can diff --git a/debian/doc-base.lsb-core b/debian/doc-base.lsb-core deleted file mode 100644 index 9d13e42..0000000 --- a/debian/doc-base.lsb-core +++ /dev/null @@ -1,10 +0,0 @@ -Document: lsb -Title: LSB as it Relates to Debian -Author: Matt Taggart -Abstract: This document compares the general Linux Standards Base written - specification to Debian. -Section: misc - -Format: HTML -Index: /usr/share/doc/lsb-core/html/index.html -Files: /usr/share/doc/lsb-core/html/* diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/lsb-core.docs b/debian/lsb-core.docs deleted file mode 100644 index 5ccff1a..0000000 --- a/debian/lsb-core.docs +++ /dev/null @@ -1 +0,0 @@ -html/ diff --git a/html/DEBtoLSB b/html/DEBtoLSB deleted file mode 100644 index 3bdc326..0000000 --- a/html/DEBtoLSB +++ /dev/null @@ -1,63 +0,0 @@ -This file provides a mapping from Debian packages needed by the LSB 1.0 spec -to the requirements of the spec that they fulfill. Section of the spec is -"Chapter 14 - Commands" unless otherwise noted. - -Last Updated: August 2, 2001 - -Debian Package Parts of LSB 1.0 --------------- ---------------- -lsb-release lsb_release -alien lsb package format (Ch. 13) -at at,batch -base-files FHS (Ch. 17) -base-passwd defined users and groups (Ch. 16) -bash sh,time, a posix shell for /bin/sh (Ch. 15) -bc bc -binutils ar,strip -bsdmainutils col -bsdutils renice -cpio cpio -cron crontab,cron (Ch. 18) -debianutils mktemp -diff cmp,diff -dpkg md5sum -exim sendmail -file file -fileutils chgrp,chmod,chown,cp,dd,df,du,install,ln,ls,mkdir,mv,rm, - rmdir,sync,touch,find,xargs -grep egrep,fgrep,grep -gzip gunzip,gzip -hostname hostname -libc6 libc,libm,libpthread,libdl,libcrypt,librt(Ch. 10) - libutil (Ch. 11) - iconv,locale,localedef -libc6-dev gencat,getconf -libncurses5 libncurses (Ch. 11) -locales libc,locale,localedef -login newgrp,su -lpr lpr -m4 m4 -make make -man-db man -mawk awk -mount mount,umount -ncurses-base libncurses (Ch. 11) -ncurses-bin libncurses (Ch. 11) -ncurses-term libncurses (Ch. 11) -passwd chfn,chsh,groupadd,groupdel,groupmod,passwd,useradd,userdel, - usermod -patch patch -procps kill,ps -psmisc fuser,killall -rsync rsync -sed sed -shellutils basename,date,dirname,echo,env,expr,false,groups,id,logname, - nice,nohup,pathchk,printf,pwd,sleep,stty,tee,test,true,tty,uname -sysvinit init (Ch. 18), pidof -tar tar -textutils cat,cksum,comm,csplit,cut,expand,fold,head,join,nl,od,paste,pr, - sort,split,sum,tail,tr,tsort,unexpand,uniq,wc -util-linux ipcrm,ipcs,more -xlibmesa3 libGL (Ch. 12) -xlibs libX11,libXext,libSM,libICE,libXt (Ch. 12) -zlib1g libz (Ch. 11) diff --git a/html/LSBtoDEB b/html/LSBtoDEB deleted file mode 100644 index 23ab10c..0000000 --- a/html/LSBtoDEB +++ /dev/null @@ -1,193 +0,0 @@ -This file provides a mapping from the LSB 1.0 spec to the corresponding packages -in the Debian "unstable" release. - -Last Updated: July 16th, 2001 - -Chapter 10 ----------- -Library Package -------- ------- -libc libc6,locales -libm libc6 -libpthread libc6 -libdl libc6 -libcrypt libc6 -librt libc6 - - -Chapter 11 ----------- -Library Package -------- ------- -libz zlib1g -libncurses libncurses5,ncurses-base,ncurses-bin,ncurses-term -libutil libc6 - - -Chapter 12 ----------- -Library Package -------- ------- -libX11 xlibs -libXext xlibs -libsm xlibs -libice xlibs -libXt xlibs -libGL xlibmesa3 - - -Chapter 13 ----------- -Command Package -------- ------- -rpm alien - - -Chapter 14 ----------- -Command Package -------- ------- -ar binutils -at at -awk mawk -basename shellutils -batch at -bc bc -cat textutils -chfn passwd -chgrp fileutils -chmod fileutils -chown fileutils -chsh passwd -cksum textutils -cmp diff -col bsdmainutils -comm textutils -cp fileutils -cpio cpio -crontab cron -csplit textutils -cut textutils -date shellutils -dd fileutils -df fileutils -diff diff -dirname shellutils -du fileutils -echo shellutils -egrep grep -env shellutils -expand textutils -expr shellutils -false shellutils -fgrep grep -file file -find findutils -fold textutils -fuser psmisc -gencat libc6-dev -getconf libc6-dev -grep grep -groupadd passwd -groupdel passwd -groupmod passwd -groups shellutils -gunzip gzip -gzip gzip -head textutils -hostname hostname -iconv libc6 -id shellutils -install fileutils -ipcrm util-linux -ipcs util-linux -join textutils -kill procps -killall psmisc -ln fileutils -locale libc6,locales -localedef libc6,locales -logname shellutils -lpr lpr -ls fileutils -lsb_release lsb-release -m4 m4 -make make -man man-db -md5sum dpkg -mkdir fileutils -mkfifo fileutils -mknod fileutils -mktemp debianutils -more util-linux -mount mount -mv fileutils -newgrp login -nice shellutils -nl textutils -nohup shellutils -od textutils -passwd passwd -paste textutils -patch patch -pathchk shellutils -pidof sysvinit -pr textutils -printf shellutils -ps procps -pwd shellutils -renice bsdutils -rm fileutils -rmdir fileutils -rsync rsync -sed sed -sendmail exim -sh bash -sleep shellutils -sort textutils -split textutils -strip binutils -stty shellutils -su login -sum textutils -sync fileutils -tail textutils -tar tar -tee shellutils -test shellutils -time bash -touch fileutils -tr textutils -true shellutils -tsort textutils -tty shellutils -umount mount -uname shellutils -unexpand textutils -uniq textutils -useradd passwd -userdel passwd -usermod passwd -wc textutils -xargs findutils - - -Chapter 15 - Shell ------------------- -posix bash - - -Chapter 16 - users & groups ---------------------------- - base-passwd - - -Chapter 17 - FHS ----------------- - base-files - - -Chapter 18 ----------- -cron cron -init sysvinit diff --git a/html/deblist b/html/deblist deleted file mode 100644 index e1a46c2..0000000 --- a/html/deblist +++ /dev/null @@ -1,49 +0,0 @@ -alien -at -base-files -base-passwd -bash -bc -binutils -bsdmainutils -bsdutils -cpio -cron -debianutils -diff -dpkg -exim -file -fileutils -grep -gzip -hostname -libc6 -libc6-dev -libncurses5 -locales -login -lpr -lsb-release -m4 -make -man-db -mawk -mount -ncurses-base -ncurses-bin -ncurses-term -passwd -patch -procps -psmisc -rsync -sed -shellutils -sysvinit -tar -textutils -util-linux -xlibmesa3 -xlibs -zlib1g diff --git a/html/depends b/html/depends deleted file mode 100644 index cac67c7..0000000 --- a/html/depends +++ /dev/null @@ -1,9 +0,0 @@ -bzip2 -debconf-utils -debhelper -html2text -libbz2-1.0 -libfreetype6 -librpm0 -rpm -xfree86-common diff --git a/html/fresh.common b/html/fresh.common deleted file mode 100644 index dcafcbc..0000000 --- a/html/fresh.common +++ /dev/null @@ -1,44 +0,0 @@ -at -base-files -base-passwd -bash -bc -binutils -bsdmainutils -bsdutils -cpio -cron -debianutils -diff -dpkg -exim -file -fileutils -grep -gzip -hostname -libc6 -libc6-dev -libncurses5 -locales -login -lpr -m4 -make -man-db -mawk -mount -ncurses-base -ncurses-bin -ncurses-term -passwd -patch -procps -psmisc -sed -shellutils -sysvinit -tar -textutils -util-linux -zlib1g diff --git a/html/fresh.extra b/html/fresh.extra deleted file mode 100644 index 3c8f9b6..0000000 --- a/html/fresh.extra +++ /dev/null @@ -1,129 +0,0 @@ -adduser -apt -apt-utils -base-config -biff -bin86 -bison -console-common -console-data -console-tools -console-tools-libs -cpp -cpp-2.95 -cpp-3.0 -dc -debconf -dhcp-client -doc-debian -doc-linux-text -dpkg-dev -e2fsprogs -ed -fdflush -fdutils -findutils -finger -flex -ftp -g++ -g++-2.95 -gcc -gcc-2.95 -gcc-3.0 -gcc-3.0-base -gdb -gettext-base -gpm -groff-base -host -iamerican -ibritish -ifupdown -info -ipchains -ipmasqadm -ispell -klogd -less -libcap1 -libdb2 -libdb3 -libgcc1 -libgdbmg1 -libident -libldap2 -liblockfile1 -libncurses4 -libnewt0 -libnss-db -libpam-modules -libpam-runtime -libpam0g -libpcre3 -libperl5.6 -libpng2 -libpopt0 -libreadline4 -libsasl-modules -libsasl7 -libstdc++2.10-dev -libstdc++2.10-glibc2.2 -libstdc++3 -libwrap0 -lilo -logrotate -lsof -lynx -mailx -makedev -manpages -manpages-dev -mbr -mime-support -modconf -modutils -mpack -mtools -mtr-tiny -mutt -nano -net-tools -netbase -netkit-inetd -netkit-ping -nfs-common -nfs-kernel-server -nvi -pciutils -perl -perl-base -perl-modules -pidentd -portmap -ppp -pppoe -procmail -python-base -python-newt -rblcheck -rcs -reportbug -setserial -sharutils -slang1 -strace -sysklogd -syslinux -tasksel -tcpd -tcsh -telnet -texinfo -time -update -util-linux-locales -vacation -wenglish -whiptail -whois diff --git a/html/fresh.new b/html/fresh.new deleted file mode 100644 index f755ba8..0000000 --- a/html/fresh.new +++ /dev/null @@ -1,5 +0,0 @@ -alien -lsb-release -rsync -xlibmesa3 -xlibs diff --git a/html/freshinstall b/html/freshinstall deleted file mode 100644 index 379f576..0000000 --- a/html/freshinstall +++ /dev/null @@ -1,173 +0,0 @@ -adduser -apt -apt-utils -at -base-config -base-files -base-passwd -bash -bc -biff -bin86 -binutils -bison -bsdmainutils -bsdutils -console-common -console-data -console-tools -console-tools-libs -cpio -cpp -cpp-2.95 -cpp-3.0 -cron -dc -debconf -debianutils -dhcp-client -diff -doc-debian -doc-linux-text -dpkg -dpkg-dev -e2fsprogs -ed -exim -fdflush -fdutils -file -fileutils -findutils -finger -flex -ftp -g++ -g++-2.95 -gcc -gcc-2.95 -gcc-3.0 -gcc-3.0-base -gdb -gettext-base -gpm -grep -groff-base -gzip -host -hostname -iamerican -ibritish -ifupdown -info -ipchains -ipmasqadm -ispell -klogd -less -libc6 -libc6-dev -libcap1 -libdb2 -libdb3 -libgcc1 -libgdbmg1 -libident -libldap2 -liblockfile1 -libncurses4 -libncurses5 -libnewt0 -libnss-db -libpam-modules -libpam-runtime -libpam0g -libpcre3 -libperl5.6 -libpng2 -libpopt0 -libreadline4 -libsasl-modules -libsasl7 -libstdc++2.10-dev -libstdc++2.10-glibc2.2 -libstdc++3 -libwrap0 -lilo -locales -login -logrotate -lpr -lsof -lynx -m4 -mailx -make -makedev -man-db -manpages -manpages-dev -mawk -mbr -mime-support -modconf -modutils -mount -mpack -mtools -mtr-tiny -mutt -nano -ncurses-base -ncurses-bin -ncurses-term -net-tools -netbase -netkit-inetd -netkit-ping -nfs-common -nfs-kernel-server -nvi -passwd -patch -pciutils -perl -perl-base -perl-modules -pidentd -portmap -ppp -pppoe -procmail -procps -psmisc -python-base -python-newt -rblcheck -rcs -reportbug -sed -setserial -sharutils -shellutils -slang1 -strace -sysklogd -syslinux -sysvinit -tar -tasksel -tcpd -tcsh -telnet -texinfo -textutils -time -update -util-linux -util-linux-locales -vacation -wenglish -whiptail -whois -zlib1g diff --git a/html/index.html b/html/index.html deleted file mode 100644 index 0f8f54e..0000000 --- a/html/index.html +++ /dev/null @@ -1,48 +0,0 @@ - - -LSB as it relates to Debian - - -

LSB as it relates to Debian

-This document compares the LSB written specification to Debian. This changes on a continual basis so check the date at the bottom for when this comparison was last updated. This is a work in progress. Please point out any errors you may find.
-
-Package lists last updated using woody on 2001-09-13
-

Required by the Specification

-First we review the spec and see what that means in terms of Debian packages. - -

Creating a Debian system plus LSB

-Now that we know what packages the spec requires we -
    -
  1. Install a "base" Debian system(including everything "required" by Debian).
    -This results in, -
      -
    • the following[4] packages on the system -
    • these[5] are in common with [3]. -
    • these[6] are in the LSB but not on the system -
    • these[7] are on the system but not in LSB -
    -
  2. Now install the packages from [3] that aren't already installed(which were identified above as [6]) -
  3. Allow all dependencies of those packages to be fulfilled
    -This results in, -
      -
    • the following[8] packages on the system -
    • the entire list([3]) of Debian packages required by LSB have been installed -
    • this[9] is the list of packages on the system but not in LSB -
    -
-

Observations

- -
-Matt Taggart <taggart@debian.org>
-Last updated September 13, 2001 - - diff --git a/html/needed b/html/needed deleted file mode 100644 index dd74928..0000000 --- a/html/needed +++ /dev/null @@ -1,14 +0,0 @@ -alien -bzip2 -debconf-utils -debhelper -html2text -libbz2-1.0 -libfreetype6 -librpm0 -lsb-release -rpm -rsync -xfree86-common -xlibmesa3 -xlibs diff --git a/html/super.extra b/html/super.extra deleted file mode 100644 index 294a146..0000000 --- a/html/super.extra +++ /dev/null @@ -1,138 +0,0 @@ -adduser -apt -apt-utils -base-config -biff -bin86 -bison -bzip2 -console-common -console-data -console-tools -console-tools-libs -cpp -cpp-2.95 -cpp-3.0 -dc -debconf -debconf-utils -debhelper -dhcp-client -doc-debian -doc-linux-text -dpkg-dev -e2fsprogs -ed -fdflush -fdutils -findutils -finger -flex -ftp -g++ -g++-2.95 -gcc -gcc-2.95 -gcc-3.0 -gcc-3.0-base -gdb -gettext-base -gpm -groff-base -host -html2text -iamerican -ibritish -ifupdown -info -ipchains -ipmasqadm -ispell -klogd -less -libbz2-1.0 -libcap1 -libdb2 -libdb3 -libfreetype6 -libgcc1 -libgdbmg1 -libident -libldap2 -liblockfile1 -libncurses4 -libnewt0 -libnss-db -libpam-modules -libpam-runtime -libpam0g -libpcre3 -libperl5.6 -libpng2 -libpopt0 -libreadline4 -librpm0 -libsasl-modules -libsasl7 -libstdc++2.10-dev -libstdc++2.10-glibc2.2 -libstdc++3 -libwrap0 -lilo -logrotate -lsof -lynx -mailx -makedev -manpages -manpages-dev -mbr -mime-support -modconf -modutils -mpack -mtools -mtr-tiny -mutt -nano -net-tools -netbase -netkit-inetd -netkit-ping -nfs-common -nfs-kernel-server -nvi -pciutils -perl -perl-base -perl-modules -pidentd -portmap -ppp -pppoe -procmail -python-base -python-newt -rblcheck -rcs -reportbug -rpm -setserial -sharutils -slang1 -strace -sysklogd -syslinux -tasksel -tcpd -tcsh -telnet -texinfo -time -update -util-linux-locales -vacation -wenglish -whiptail -whois -xfree86-common diff --git a/html/superset b/html/superset deleted file mode 100644 index 63cde84..0000000 --- a/html/superset +++ /dev/null @@ -1,187 +0,0 @@ -adduser -alien -apt -apt-utils -at -base-config -base-files -base-passwd -bash -bc -biff -bin86 -binutils -bison -bsdmainutils -bsdutils -bzip2 -console-common -console-data -console-tools -console-tools-libs -cpio -cpp -cpp-2.95 -cpp-3.0 -cron -dc -debconf -debconf-utils -debhelper -debianutils -dhcp-client -diff -doc-debian -doc-linux-text -dpkg -dpkg-dev -e2fsprogs -ed -exim -fdflush -fdutils -file -fileutils -findutils -finger -flex -ftp -g++ -g++-2.95 -gcc -gcc-2.95 -gcc-3.0 -gcc-3.0-base -gdb -gettext-base -gpm -grep -groff-base -gzip -host -hostname -html2text -iamerican -ibritish -ifupdown -info -ipchains -ipmasqadm -ispell -klogd -less -libbz2-1.0 -libc6 -libc6-dev -libcap1 -libdb2 -libdb3 -libfreetype6 -libgcc1 -libgdbmg1 -libident -libldap2 -liblockfile1 -libncurses4 -libncurses5 -libnewt0 -libnss-db -libpam-modules -libpam-runtime -libpam0g -libpcre3 -libperl5.6 -libpng2 -libpopt0 -libreadline4 -librpm0 -libsasl-modules -libsasl7 -libstdc++2.10-dev -libstdc++2.10-glibc2.2 -libstdc++3 -libwrap0 -lilo -locales -login -logrotate -lpr -lsb-release -lsof -lynx -m4 -mailx -make -makedev -man-db -manpages -manpages-dev -mawk -mbr -mime-support -modconf -modutils -mount -mpack -mtools -mtr-tiny -mutt -nano -ncurses-base -ncurses-bin -ncurses-term -net-tools -netbase -netkit-inetd -netkit-ping -nfs-common -nfs-kernel-server -nvi -passwd -patch -pciutils -perl -perl-base -perl-modules -pidentd -portmap -ppp -pppoe -procmail -procps -psmisc -python-base -python-newt -rblcheck -rcs -reportbug -rpm -rsync -sed -setserial -sharutils -shellutils -slang1 -strace -sysklogd -syslinux -sysvinit -tar -tasksel -tcpd -tcsh -telnet -texinfo -textutils -time -update -util-linux -util-linux-locales -vacation -wenglish -whiptail -whois -xfree86-common -xlibmesa3 -xlibs -zlib1g diff --git a/init-functions b/init-functions index 8644298..72435cb 100644 --- a/init-functions +++ b/init-functions @@ -135,7 +135,7 @@ log_success_msg () { } log_failure_msg () { - if $FANCYTTY; then + if [ $FANCYTTY -eq 1 ]; then RED=`$TPUT setaf 1` NORMAL=`$TPUT op` echo "$RED*$NORMAL $@" @@ -145,7 +145,7 @@ log_failure_msg () { } log_warning_msg () { - if $FANCYTTY; then + if [ $FANCYTTY -eq 1 ]; then YELLOW=`$TPUT setaf 3` NORMAL=`$TPUT op` echo "$YELLOW*$NORMAL $@" @@ -175,12 +175,38 @@ log_begin_msg () { echo -n "$@" } +# Sample usage: +# log_daemon_msg "Starting GNOME Login Manager" "gdm" +# +# On Debian, would output "Starting GNOME Login Manager: gdm" +# On Ubuntu, would output " * Starting GNOME Login Manager..." +# +# If the second argument is omitted, logging suitable for use with +# log_progress_msg() is used: +# +# log_daemon_msg "Starting remote filesystem services" +# +# On Debian, would output "Starting remote filesystem services:" +# On Ubuntu, would output " * Starting remote filesystem services..." + +log_daemon_msg () { + if [ -z "$1" ]; then + return 1 + fi + + if [ -z "$2" ]; then + echo -n "$1:" + return + fi + + echo -n "$1: $2" +} # #319739 # # Per policy docs: # -# log_begin_msg "Starting remote file system services:" +# log_daemon_msg "Starting remote file system services" # log_progress_msg "nfsd"; start-stop-daemon --start --quiet nfsd # log_progress_msg "mountd"; start-stop-daemon --start --quiet mountd # log_progress_msg "ugidd"; start-stop-daemon --start --quiet ugidd @@ -189,12 +215,13 @@ log_begin_msg () { # You could also do something fancy with log_end_msg here based on the # return values of start-stop-daemon; this is left as an exercise for # the reader... - +# +# On Ubuntu, one would expect log_progress_msg to be a no-op. log_progress_msg () { if [ -z "$1" ]; then return 1 fi - /bin/echo -n " $@" + echo -n " $@" } @@ -206,7 +233,7 @@ log_end_msg () { # Only do the fancy stuff if we have an appropriate terminal # and if /usr is already mounted - if $FANCYTTY; then + if [ $FANCYTTY -eq 1 ]; then RED=`$TPUT setaf 1` NORMAL=`$TPUT op` if [ $1 -eq 0 ]; then @@ -223,4 +250,3 @@ log_end_msg () { fi return $1 } - diff --git a/lsbinstall b/lsbinstall index 60aaa17..fcc9786 100755 --- a/lsbinstall +++ b/lsbinstall @@ -12,7 +12,7 @@ objecttypes = ( #'init', 'profile', 'service', - 'inet', + #'inet', # XXX - reenable when implemented #'crontab', #'man' ) -- 2.30.2