Hello community, here is the log from the commit of package aaa_base checked in at Fri Feb 15 01:06:56 CET 2008. -------- --- aaa_base/aaa_base.changes 2008-01-24 15:48:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-02-12 15:25:36.731040000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 12 15:23:54 CET 2008 - rguenther@suse.de + +- Add requires to /bin/login, required from inittab invoking + mingetty with default arguments. + +------------------------------------------------------------------- +Mon Feb 11 14:30:26 CET 2008 - werner@suse.de + +- No indirect calls of binaries but use explicit path (bnc#353437) + +------------------------------------------------------------------- +Thu Jan 31 15:39:25 CET 2008 - ro@suse.de + +- run yast2 firstboot if needed in etc/init.d/boot (#354738) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Z20781/_old 2008-02-15 01:06:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Z20781/_new 2008-02-15 01:06:26.000000000 +0100 @@ -10,17 +10,18 @@ # norootforbuild + Name: aaa_base License: GPL v2 or later Group: System/Fhs Provides: bin bootutls etc skeleng skelger aaa_skel Obsoletes: aaa_skel -Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/xargs mingetty cpio udev psmisc +Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/xargs mingetty /bin/login cpio udev psmisc Recommends: logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools AutoReqProv: on Version: 11.0 -Release: 24 +Release: 30 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -141,6 +142,13 @@ %defattr(-,root,root) %changelog +* Tue Feb 12 2008 rguenther@suse.de +- Add requires to /bin/login, required from inittab invoking + mingetty with default arguments. +* Mon Feb 11 2008 werner@suse.de +- No indirect calls of binaries but use explicit path (bnc#353437) +* Thu Jan 31 2008 ro@suse.de +- run yast2 firstboot if needed in etc/init.d/boot (#354738) * Thu Jan 24 2008 werner@suse.de - Set HW clock before mounting the local file systems * Wed Jan 23 2008 ro@suse.de @@ -205,7 +213,7 @@ - Remove .hal-mtab on boot [#329688]. * Tue Oct 16 2007 ro@suse.de - second try to fix hostname setting (#300571) -* Tue Oct 09 2007 ro@suse.de +* Wed Oct 10 2007 ro@suse.de - remove sysconfig/sw_management (#331955) * Fri Oct 05 2007 jjolly@suse.de - Using hostname option from 'ip' boot parameter (#300571) @@ -245,7 +253,7 @@ - add mimetypes for .ymp and .ymu files (#295677) * Mon Jul 30 2007 dmueller@suse.de - remove /bin/ps prereq and replace it with $SHELL -* Fri Jul 27 2007 coolo@suse.de +* Sat Jul 28 2007 coolo@suse.de - revert the last two changes as they break too much for the moment * Fri Jul 27 2007 werner@suse.de - Add /bin/ps to PreReq and procps to BuildRequires for last change @@ -627,7 +635,7 @@ - boot.rootfsck: remove obsolete umount of /lib/klibc/dev * Thu Jan 19 2006 ro@suse.de - added SuSEconfig.insserv_cleanup -* Mon Jan 16 2006 schwab@suse.de +* Tue Jan 17 2006 schwab@suse.de - Don't strip binaries. - Use RPM_OPT_FLAGS. * Mon Jan 16 2006 mmj@suse.de @@ -1607,7 +1615,7 @@ - removed outdated part of comment in sysconfig/language (#24535) * Fri Feb 28 2003 ro@suse.de - clean-tmp cron.daily-script: leave pipes alone (like sockets) -* Thu Feb 27 2003 ro@suse.de +* Fri Feb 28 2003 ro@suse.de - moved named user to bind packages * Thu Feb 27 2003 ro@suse.de - removed the gdm-binary hack (/etc/init.d/xdm) @@ -1749,7 +1757,7 @@ * Mon Nov 04 2002 ro@suse.de - added ",v" as file-ending to be ignored in SuSEconfig.doublecheck (#21508) -* Wed Oct 30 2002 ro@suse.de +* Thu Oct 31 2002 ro@suse.de - added xf86 to neededforbuild (for /etc/skel/.xinitrc) * Tue Oct 29 2002 sndirsch@suse.de - fixed stop/reload/status target for gdm in xdm script (Bug #18533) @@ -1819,7 +1827,7 @@ * Mon Sep 09 2002 ro@suse.de - changed char-major-81 from bttv to videodev - added char-major-81-[0-3] as off (#19122) -* Sun Sep 08 2002 ro@suse.de +* Mon Sep 09 2002 ro@suse.de - added multipath as raid-style fs (#19109) * Fri Sep 06 2002 mls@suse.de - chkconfig changes: @@ -1901,7 +1909,7 @@ root_dir/etc/fstab * Fri Aug 16 2002 stepan@suse.de - change sysconfig and boot.proc to fit boot splash theming -* Thu Aug 15 2002 ro@suse.de +* Fri Aug 16 2002 ro@suse.de - remove boot.setup from required tags in boot.* scripts * Thu Aug 15 2002 werner@suse.de - New version of insserv 0.99.5: @@ -2131,7 +2139,7 @@ - removed runlevel for si from inittab, it's ignored anyways * Fri Jun 07 2002 ro@suse.de - removed zope user (created by package now) -* Mon Jun 03 2002 ro@suse.de +* Tue Jun 04 2002 ro@suse.de - remove /usr/share/doc/support (outdated support forms) - remove some old unused cruft from specfile * Fri May 31 2002 werner@suse.de @@ -2147,7 +2155,7 @@ - removed OPENWINHOME variable (in xview package now) - removed variables MAPLE,DMARSCONF,CRPATH,BLENDERDIR from SuSEconfig.profiles -* Sun May 26 2002 ro@suse.de +* Mon May 27 2002 ro@suse.de - removed bootsetup.dif from arch_special stuff * Fri May 24 2002 kukuk@suse.de - Remove obsolete user ingres @@ -2208,7 +2216,7 @@ - test for existence of /sbin/blogd before trying to send signals * Wed Mar 27 2002 ro@suse.de - fixed some more permissions (kwintv,kradio) -* Tue Mar 26 2002 ro@suse.de +* Wed Mar 27 2002 ro@suse.de - removed s-bit from kscd in permissions.easy (#15548) * Mon Mar 25 2002 ro@suse.de - updated permissions files @@ -2413,7 +2421,7 @@ - implement some chkconfig functionality * Sun Feb 10 2002 ro@suse.de - tar option for bz2 is now "j" -* Fri Feb 08 2002 bk@suse.de +* Sat Feb 09 2002 bk@suse.de - nsswitch.conf holds vital configuration - should be noreplace post install script should check that all needed entries (e.g. autofs: files - don't know if really, just an idea) @@ -2479,7 +2487,7 @@ * Thu Jan 31 2002 ro@suse.de - modified fillup to keep file-header only in rc.config (thanks to jd) -* Wed Jan 30 2002 ro@suse.de +* Thu Jan 31 2002 ro@suse.de - removed zshrc and zshenv (moved to zsh package) - removed old checks for YAST_ASK, all these values are gone now - rc.status: added status unknown (4) as specified by LSB @@ -2517,7 +2525,7 @@ - Check: don't gzip XftCache files - removed MODEM from rc.config (obsolete) - set values to empty where YAST_ASK was before -* Sun Jan 27 2002 schwab@suse.de +* Mon Jan 28 2002 schwab@suse.de - Don't use obsolete sort options for field selection. - Don't duplicate each empty line in /etc/rc.config. * Fri Jan 25 2002 mfabian@suse.de @@ -2621,7 +2629,7 @@ - Make ip-up start of SuSEfirewall dependant on rc.d symlinks * Fri Jan 11 2002 kukuk@suse.de - remove all obsolete YP variables from rc.config -* Thu Jan 10 2002 ro@suse.de +* Fri Jan 11 2002 ro@suse.de - removed /usr/games/bin from path * Thu Jan 10 2002 kukuk@suse.de - Domainname is now in /etc/defaultdomain @@ -2797,7 +2805,7 @@ * Tue Sep 25 2001 ro@suse.de - /etc/profile: source SuSEconfig.profile once, but only once (#11277) -* Mon Sep 24 2001 ro@suse.de +* Tue Sep 25 2001 ro@suse.de - clean_core: do also search for core-files like core.[0-9]* * Mon Sep 24 2001 ro@suse.de - added option --nomodule to SuSEconfig @@ -2818,7 +2826,7 @@ - Move complete part of /etc/bash.bashrc into /etc/profile.d/complete.bash to avoid parser errors of other shells. -* Thu Sep 20 2001 ro@suse.de +* Fri Sep 21 2001 ro@suse.de - added force-reload for etc/init.d/nfs (#9053) * Thu Sep 20 2001 kukuk@suse.de - umount /proc after calling vgchange (#11095) @@ -2887,7 +2895,7 @@ - rewrote pre/postinstall handling for passwd et al to not use bin/fillup because of it's charset limitiations, but use the utilities "sort" and "uniq" -* Sun Sep 09 2001 ro@suse.de +* Mon Sep 10 2001 ro@suse.de - integrate s390 special case into etc/init.d/boot (the patch did not apply anymore anyway) * Fri Sep 07 2001 mantel@suse.de @@ -3417,7 +3425,7 @@ * Wed Feb 28 2001 ro@suse.de - moved hwclock call in bootscript after mounting filesystems (#6404) -* Mon Feb 26 2001 ro@suse.de +* Tue Feb 27 2001 ro@suse.de - fixed typo in specfile * Fri Feb 23 2001 ro@suse.de - replace use of aaa_base_versions by build-generated .buildenv @@ -3459,7 +3467,7 @@ - start yast1/2 firstboot-scripts with a real console * Thu Jan 18 2001 ro@suse.de - fixed printing of root-login message -* Wed Jan 17 2001 ro@suse.de +* Thu Jan 18 2001 ro@suse.de - deleted db2 users and groups (46,47,48 uid and gid) * Wed Jan 17 2001 schwab@suse.de - Add ia32 lib paths to ld.so.conf. @@ -3499,12 +3507,12 @@ - removed pre-install i810 from modules.conf again * Thu Jan 11 2001 ro@suse.de - move kill of blogd before yast1 start -* Wed Jan 10 2001 mantel@suse.de -- load module mssclampfw for pppox -* Wed Jan 10 2001 bk@suse.de +* Thu Jan 11 2001 bk@suse.de - added aliases for ppp-compress-18(ppp_mppe) and 24(ppp_deflate) to modules.conf -* Tue Jan 09 2001 ro@suse.de +* Thu Jan 11 2001 mantel@suse.de +- load module mssclampfw for pppox +* Wed Jan 10 2001 ro@suse.de - added comment for ROOT variable in SuSEconfig * Tue Jan 09 2001 snwint@suse.de - fixed mk_initrd to _really_ create no initrd unless necessary @@ -3539,7 +3547,7 @@ * Wed Dec 20 2000 bk@suse.de - Make permissions.paranoid consistent with last months /var/run permissions change to make it root.root 755. (Fix for bug #2857) -* Tue Dec 19 2000 bk@suse.de +* Wed Dec 20 2000 bk@suse.de - changed kernel OSS examples comment to reflect ALSA. * Tue Dec 19 2000 kkeil@suse.de - fixed mk_initrd (had been modified based on older version before) @@ -3837,7 +3845,7 @@ - Change YaST2 path for SuSE 7.0 (now /usr/lib/YaST2/) * Wed Jun 07 2000 bk@suse.de - updated spec for 6.4-s390 -* Sun Jun 04 2000 ro@suse.de +* Mon Jun 05 2000 ro@suse.de - added missing oldstat file * Wed May 31 2000 werner@suse.de - Add /etc/rc.status for status handling within boot scripts @@ -3905,7 +3913,7 @@ - fixed typo in /etc/shells: /usr/bin/tcsh (not tcs) * Wed Apr 05 2000 mantel@suse.de - added alias net-pf-1 -> unix -* Tue Apr 04 2000 werner@suse.de +* Wed Apr 05 2000 werner@suse.de - route: Add a patch from Andreas Schwab and make it work for all cases. - Speed up the reverse shell function for bigger /etc/route.conf * Fri Mar 31 2000 ro@suse.de @@ -3943,7 +3951,7 @@ * Thu Mar 09 2000 bk@suse.de - set RC_LC_COLLATE to POSIX per default, this fixes problems with bash and unexpected [A-Z] wildcard behaviour. -* Wed Mar 08 2000 bk@suse.de +* Thu Mar 09 2000 bk@suse.de - disabled setting of host route in ISDN ip-down case(from kkeil) * Wed Mar 08 2000 werner@suse.de - Don't run mandb with straycats on. @@ -3963,7 +3971,7 @@ - small path correction in alsa driver documentation comment. * Mon Mar 06 2000 bk@suse.de - added alias char-major-144 pppox for PPP over Ethernet (PPP over X) -* Sun Mar 05 2000 ro@suse.de +* Mon Mar 06 2000 ro@suse.de - added alias net-pf-10 ipv6 * Sun Mar 05 2000 ro@suse.de - fix for taking old modules.conf settings even if file @@ -4229,7 +4237,7 @@ - etc/profile: unset DIR (BUG#410) - etc/permissions.d: respect files for packages (BUG#394) - etc/logfiles: added squid logs (BUG#676) -* Mon Oct 18 1999 ro@suse.de +* Tue Oct 19 1999 ro@suse.de - updates for /sbin/init.d/{boot,boot.setup,rc} from werner - fix aliases for recode (BUG#299) - move /usr/openwin/bin last in PATH (BUG#313) @@ -4382,7 +4390,7 @@ - added /opt/kde/bin/apm_proxy (SUID only in permissions.easy) * Fri Apr 30 1999 ro@suse.de - updated bootp script to work with 2.2 -* Tue Apr 27 1999 ro@suse.de +* Wed Apr 28 1999 ro@suse.de - bugfix in /sbin/init.d/nscd (packaed only for glibc-2.1) * Mon Apr 19 1999 ro@suse.de - added mouse comment to conf.modules @@ -4414,7 +4422,7 @@ * Thu Apr 08 1999 ro@suse.de - fixed problem in /sbin/init.d/boot: gpm is in usr/sbin - pkgmake: don't remove "no newline" lines -* Tue Apr 06 1999 bs@suse.de +* Wed Apr 07 1999 bs@suse.de - removed route.orig * Tue Apr 06 1999 bs@suse.de - /sbin/init.d/boot: recreate modules.dep, if /etc/conf.modules is newer. @@ -4463,7 +4471,7 @@ - gnuplot changed to 755 in permissions and to 4755 in permissions.eazy * Wed Mar 10 1999 ro@suse.de - fixed GID's for IBM-DB2 groups -* Tue Mar 09 1999 ro@suse.de +* Wed Mar 10 1999 ro@suse.de - updated script /sbin/init.d/dummy (from werner): - use netmask 255.255.255.255 for ifconfig - use metric 1 for route to dummy device @@ -4523,7 +4531,7 @@ * Thu Dec 17 1998 bs@suse.de - fixed WINDOWMANAGER in /etc/SuSEconfig/csh.cshrc - fiex /etc/csh.cshrc (problem, if /etc/SuSEconfig is empty) -* Mon Dec 14 1998 bs@suse.de +* Tue Dec 15 1998 bs@suse.de - fixed ~ for news * Mon Dec 14 1998 bs@suse.de - etc/profile.d/profile,csh.cshrc: set WINDOWMANAGER only if empty @@ -4538,7 +4546,7 @@ - added man page for resolv+ * Mon Dec 14 1998 bs@suse.de - fixed alias proble in /sbin/init.d/network -* Sun Dec 13 1998 bs@suse.de +* Mon Dec 14 1998 bs@suse.de - removed /sbin/init.d/boot.d from /etc/permissions * Sun Dec 13 1998 bs@suse.de - delete usr/i486-linux-libc6/lib/libqimgio.so if it is a symlink @@ -4550,7 +4558,7 @@ - added old man pages fstab and nfs (from ldpman-1.17) * Sun Dec 13 1998 bs@suse.de - added support forms again. -* Sat Dec 12 1998 bs@suse.de +* Sun Dec 13 1998 bs@suse.de - disabled sorting of passwd by default - make sure, that root is on the first line, when sorting passwd. - SuSEconfig: start newaliases for smail @@ -4645,7 +4653,7 @@ and MAX_DAYS_IN_TMP. * Wed Nov 18 1998 bs@suse.de - fixed deletion of utmp in /sbin/init.d/boot -* Tue Nov 17 1998 bs@suse.de +* Wed Nov 18 1998 bs@suse.de - use DEFAULT_WM for WINDOWMANAGER. * Tue Nov 17 1998 bs@suse.de - use zic in SuSEconfig and /sbin/init.d/boot to setup timezone. ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc --- old/aaa_base/etc/bash.bashrc 2008-01-08 17:08:47.000000000 +0100 +++ new/aaa_base/etc/bash.bashrc 2008-02-11 14:27:42.000000000 +0100 @@ -43,10 +43,23 @@ fi # -# ksh/ash soemtimes do not know +# Call common progams from /bin or /usr/bin only # -test -z "$UID" && readonly UID=`id -ur 2> /dev/null` -test -z "$EUID" && readonly EUID=`id -u 2> /dev/null` +path () +{ + if test -x /usr/bin/$1 ; then + ${1+"/usr/bin/$@"} + elif test -x /bin/$1 ; then + ${1+"/bin/$@"} + fi +} + + +# +# ksh/ash sometimes do not know +# +test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` +test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` # # Colored file listings @@ -82,8 +95,8 @@ # if test "$EMACS" = "t" ; then LS_OPTIONS='-N --color=none -T 0'; - tset -I -Q - stty cooked pass8 dec nl -echo + path tset -I -Q + path stty cooked pass8 dec nl -echo fi export LS_OPTIONS @@ -101,7 +114,7 @@ echo "No startx installed" 1>&2 return 1; } - /usr/bin/startx ${1+"$@"} 2>&1 | tee $HOME/.xsession-errors + /usr/bin/startx ${1+"$@"} 2>&1 | tee $HOME/.xsession-errors } remount () { /bin/mount -o remount,${1+"$@"} ; } fi @@ -166,9 +179,9 @@ ;; esac # Colored root prompt (see bugzilla #144620) - if test "$UID" -eq 0 -a -t && type -p tput > /dev/null 2>&1 ; then - _bred="$(tput bold 2> /dev/null; tput setaf 1 2> /dev/null)" - _sgr0="$(tput sgr0 2> /dev/null)" + if test "$UID" -eq 0 -a -t ; then + _bred="$(path tput bold 2> /dev/null; path tput setaf 1 2> /dev/null)" + _sgr0="$(path tput sgr0 2> /dev/null)" PS1="\[$_bred\]$PS1\[$_sgr0\]" unset _bred _sgr0 fi @@ -248,7 +261,7 @@ fi alias rd=rmdir alias md='mkdir -p' - if test "$is" = "bash" && ! type -p which > /dev/null 2>&1 ; then + if test "$is" = "bash" -a ! -x /bin/which -a ! -x /usr/bin/which ; then # # Other shells use the which command in path (e.g. ash) or # their own builtin for the which command (e.g. ksh and zsh). @@ -265,7 +278,7 @@ alias which=_which fi alias rehash='hash -r' - alias you='[ `id -u` = 0 ] && /sbin/yast2 online_update || su - -c "/sbin/yast2 online_update"' + alias you='test "$EUID" = 0 && /sbin/yast2 online_update || su - -c "/sbin/yast2 online_update"' if test "$is" != "ksh" ; then alias beep='echo -en "\007"' else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.cshrc new/aaa_base/etc/csh.cshrc --- old/aaa_base/etc/csh.cshrc 2007-07-16 14:47:26.000000000 +0200 +++ new/aaa_base/etc/csh.cshrc 2008-02-11 14:27:27.000000000 +0100 @@ -15,6 +15,16 @@ onintr - set noglob # +# Call common progams from /bin or /usr/bin only +# +alias path 'if ( -x /bin/\!^ ) /bin/\!*; if ( -x /usr/bin/\!^ ) /usr/bin/\!*' +if ( -x /bin/id ) then + set id=/bin/id +else if ( -x /usr/bin/id ) then + set id=/usr/bin/id +endif + +# # Default echo style # set echo_style=both @@ -29,8 +39,18 @@ # # In case if not known # -if (! ${?UID} ) set -r UID="`id -ur`" -if (! ${?EUID} ) set -r EUID="`id -u`" +if (! ${?UID} ) set -r UID=${uid} +if (! ${?EUID} ) set -r EUID="`${id} -u`" + +# +# Avoid trouble with Emacs shell mode +# +if ($?EMACS) then + setenv LS_OPTIONS '-N --color=none -T 0'; + path tset -I -Q + path stty cooked pass8 dec nl -echo +# if ($?tcsh) unset edit +endif # # Only for interactive shells @@ -78,9 +98,9 @@ # if ( -x /usr/bin/dircolors ) then if ( -r $HOME/.dir_colors ) then - eval `dircolors -c $HOME/.dir_colors` + eval `/usr/bin/dircolors -c $HOME/.dir_colors` else if ( -r /etc/DIR_COLORS ) then - eval `dircolors -c /etc/DIR_COLORS` + eval `/usr/bin/dircolors -c /etc/DIR_COLORS` endif endif setenv LS_OPTIONS '--color=tty' @@ -107,13 +127,9 @@ alias cd.. 'cd ..' alias rd rmdir alias md 'mkdir -p' -# Handle emacs -if ($?EMACS) then - setenv LS_OPTIONS '-N --color=none -T 0'; - tset -I -Q - stty cooked pass8 dec nl -echo -# if ($?tcsh) unset edit -endif +alias startx 'if ( ! -x /usr/bin/startx ) echo "No startx installed";\ + if ( -x /usr/bin/startx ) /usr/bin/startx |& tee ${HOME}/.xsession-error' +alias remount '/bin/mount -o remount,\!*' # # Prompting and Xterm title @@ -166,7 +182,7 @@ # where this make sense, but not for the new tcsh 6.14. # if ($_rev < 6 || ($_rev == 6 && $_rel < 14)) then - switch ( `locale charmap` ) + switch ( `/usr/bin/locale charmap` ) case UTF-8: set dspmbyte=utf8 breaksw diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2008-01-09 12:05:31.000000000 +0100 +++ new/aaa_base/etc/csh.login 2008-02-11 14:26:41.000000000 +0100 @@ -8,6 +8,16 @@ # onintr - set noglob +# +# Call common progams from /bin or /usr/bin only +# +alias path 'if ( -x /bin/\!^ ) /bin/\!*; if ( -x /usr/bin/\!^ ) /usr/bin/\!*' +if ( -x /bin/id ) then + set id=/bin/id +else if ( -x /usr/bin/id ) then + set id=/usr/bin/id +endif + # # Initialize terminal # @@ -16,16 +26,15 @@ if ( ! ${?TERM} ) setenv TERM linux if ( "$TERM" == "unknown" ) setenv TERM linux if ( ! ${?SSH_TTY} ) then - # No tset available on SlackWare - if ( -x "`which stty`" ) stty sane cr0 pass8 dec - if ( -x "`which tset`" ) tset -I -Q + path stty sane cr0 pass8 dec + path tset -I -Q endif # on iSeries virtual console, detect screen size and terminal if ( -d /proc/iSeries && ( $tty == "tty1" || "$tty" == "console")) then setenv LINES 24 setenv COLUMNS 80 - if ( -x "`which initviocons`" ) then - eval `initviocons -q -e -c` + if ( -x /bin/initviocons ) then + eval `/bin/initviocons -q -e -c` endif endif settc km yes @@ -48,16 +57,14 @@ # # In case if not known # -if (! ${?UID} ) set -r UID="`id -ur`" -if (! ${?EUID} ) set -r EUID="`id -u`" -if (! ${?USER} ) set USER="`id -un`" -if (! ${?LOGNAME} ) set LOGNAME=$USER - +if (! ${?UID} ) set -r UID=${uid} +if (! ${?EUID} ) set -r EUID="`${id} -u`" +if (! ${?USER} ) set USER="`${id} -un`" if (! ${?MAIL} ) setenv MAIL /var/spool/mail/$USER -if (! ${?HOST} ) setenv HOST "`hostname -s`" -if (! ${?CPU} ) setenv CPU "`uname -m`" -if (! ${?HOSTNAME} ) setenv HOSTNAME "`hostname -f`" -if (! ${?LOGNAME} ) setenv LOGNAME "$USER" +if (! ${?HOST} ) setenv HOST "`/bin/hostname -s`" +if (! ${?CPU} ) setenv CPU "`/bin/uname -m`" +if (! ${?HOSTNAME} ) setenv HOSTNAME "`/bin/hostname -f`" +if (! ${?LOGNAME} ) set LOGNAME=$USER if ( ${CPU} =~ i?86 ) then setenv HOSTTYPE i386 else @@ -169,9 +176,9 @@ # if (! ${?CSHRCREAD} && -x /usr/bin/manpath ) then if ( ${?MANPATH} ) then - setenv MANPATH "${MANPATH}:`(unsetenv MANPATH; manpath -q)`" + setenv MANPATH "${MANPATH}:`(unsetenv MANPATH; /usr/bin/manpath -q)`" else - setenv MANPATH "`(unsetenv MANPATH; manpath -q)`" + setenv MANPATH "`(unsetenv MANPATH; /usr/bin/manpath -q)`" endif endif @@ -233,7 +240,7 @@ if ( -r /etc/SuSEconfig/csh.login ) source /etc/SuSEconfig/csh.login if (! ${?SSH_SENDS_LOCALE} ) then if ( -r /etc/sysconfig/language && -r /etc/profile.d/csh.utf8 ) then - set _tmp=`sh -c '. /etc/sysconfig/language; echo $AUTO_DETECT_UTF8'` + set _tmp=`/bin/sh -c '. /etc/sysconfig/language; echo $AUTO_DETECT_UTF8'` if ( ${_tmp} == "yes" ) source /etc/profile.d/csh.utf8 unset _tmp endif @@ -297,9 +304,12 @@ # # shadow passwd # Note: on normal console this will be done by /bin/login - if ( -x "`which faillog`" && -r /var/log/faillog ) faillog + if ( -r /var/log/faillog ) then + if ( -x /bin/faillog ) /bin/faillog + if ( -x /usr/bin/faillog ) /usr/bin/faillog + endif # Last but not least - date + /bin/date endif endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2007-04-16 11:58:00.000000000 +0200 +++ new/aaa_base/etc/init.d/boot 2008-02-11 18:22:48.000000000 +0100 @@ -307,6 +307,17 @@ rm -f /var/lib/YaST2/runme_at_boot fi fi +if test -f /var/lib/YaST2/reconfig_system ; then + HOSTTYPE=$(uname -m) + splashtrigger "YaST" + exec 0<> $REDIRECT 1>&0 2>&0 + if test -x /usr/lib/YaST2/startup/YaST2.Firstboot; then + /usr/lib/YaST2/startup/YaST2.Firstboot + else + # oops, yast2-firstboot not installed + rm -f /var/lib/YaST2/reconfig_system + fi +fi # run SuSEconfig (with args) if needed if test -f /var/lib/YaST2/run_suseconfig ; then /sbin/SuSEconfig `cat /var/lib/YaST2/run_suseconfig` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2008-01-14 09:15:28.000000000 +0100 +++ new/aaa_base/etc/profile 2008-02-11 14:00:51.000000000 +0100 @@ -41,17 +41,29 @@ fi # +# Call common progams from /bin or /usr/bin only +# +path () +{ + if test -x /usr/bin/$1 ; then + ${1+"/usr/bin/$@"} + elif test -x /bin/$1 ; then + ${1+"/bin/$@"} + fi +} + +# # Initialize terminal # -tty=`tty 2> /dev/null` +tty=`path tty 2> /dev/null` test $? -ne 0 && tty="" if test -O "$tty" -a -n "$PS1"; then test -z "${TERM}" && { TERM=linux; export TERM; } test "${TERM}" = "unknown" && { TERM=linux; export TERM; } # Do not change settings on local line if connected to remote if test -z "$SSH_TTY" ; then - test -x /bin/stty && /bin/stty sane cr0 pass8 dec - test -x /usr/bin/tset && /usr/bin/tset -I -Q + path stty sane cr0 pass8 dec + path tset -I -Q fi # on iSeries virtual console, detect screen size and terminal if test -d /proc/iSeries -a \( "$tty" = "/dev/tty1" -o "$tty" = "/dev/console" \) ; then @@ -91,9 +103,9 @@ # # ksh/ash sometimes do not know # -test -z "$UID" && readonly UID=`id -ur 2> /dev/null` -test -z "$EUID" && readonly EUID=`id -u 2> /dev/null` -test -z "$USER" && USER=`id -un 2> /dev/null` +test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` +test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` +test -z "$USER" && USER=`path id -un 2> /dev/null` test -z "$MAIL" && MAIL=/var/spool/mail/$USER test -z "$HOST" && HOST=`/bin/hostname -s 2> /dev/null` test -z "$CPU" && CPU=`/bin/uname -m 2> /dev/null` ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de