commit mkinitrd for openSUSE:Factory
Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu Jan 22 16:51:16 CET 2009. -------- --- mkinitrd/mkinitrd.changes 2009-01-21 20:41:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2009-01-22 16:33:25.092411697 +0100 @@ -1,0 +2,6 @@ +Thu Jan 22 16:31:18 CET 2009 - bwalle@suse.de + +- Resolve hostnames in /etc/hosts (bnc #468090). +- Update version to 2.5.4. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Y28538/_old 2009-01-22 16:51:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Y28538/_new 2009-01-22 16:51:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mkinitrd (Version 2.5.3) +# spec file for package mkinitrd (Version 2.5.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ BuildRequires: asciidoc Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on -Version: 2.5.3 +Version: 2.5.4 Release: 1 Conflicts: udev < 118 Requires: dhcpcd @@ -123,6 +123,9 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog +* Thu Jan 22 2009 bwalle@suse.de +- Resolve hostnames in /etc/hosts (bnc #468090). +- Update version to 2.5.4. * Wed Jan 21 2009 bwalle@suse.de - Include libunwind on IA64 (bnc #459218). - Update version to 2.5.3. ++++++ mkinitrd.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.3/mkinitrd.changes new/mkinitrd-2.5.4/mkinitrd.changes --- old/mkinitrd-2.5.3/mkinitrd.changes 2009-01-21 20:33:43.000000000 +0100 +++ new/mkinitrd-2.5.4/mkinitrd.changes 2009-01-22 16:32:17.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 22 16:31:18 CET 2009 - bwalle@suse.de + +- Resolve hostnames in /etc/hosts (bnc #468090). +- Update version to 2.5.4. + +------------------------------------------------------------------- Wed Jan 21 20:33:11 CET 2009 - bwalle@suse.de - Include libunwind on IA64 (bnc #459218). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.3/sbin/mkinitrd new/mkinitrd-2.5.4/sbin/mkinitrd --- old/mkinitrd-2.5.3/sbin/mkinitrd 2009-01-21 20:33:43.000000000 +0100 +++ new/mkinitrd-2.5.4/sbin/mkinitrd 2009-01-22 16:32:17.000000000 +0100 @@ -25,7 +25,7 @@ # git://git.opensuse.org/projects/mkinitrd.git # -VERSION=2.5.3 +VERSION=2.5.4 LOGDIR=/var/log/YaST2 LOGFILE=$LOGDIR/mkinitrd.log declare -a cmd_option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.3/scripts/boot-network.sh new/mkinitrd-2.5.4/scripts/boot-network.sh --- old/mkinitrd-2.5.3/scripts/boot-network.sh 2009-01-21 20:33:43.000000000 +0100 +++ new/mkinitrd-2.5.4/scripts/boot-network.sh 2009-01-22 16:32:17.000000000 +0100 @@ -24,17 +24,18 @@ # mac address based config if [ "$macaddress" ] ; then for dev in /sys/class/net/* ; do - # skip files that are no directories - if ! [ -d $dev ] ; then - continue - fi - - read tmpmac < $dev/address - if [ "$tmpmac" == "$macaddress" ] ; then - interface=${dev##*/} - echo "[NETWORK] using interface $interface" - fi + # skip files that are no directories + if ! [ -d $dev ] ; then + continue + fi + + read tmpmac < $dev/address + if [ "$tmpmac" == "$macaddress" ] ; then + interface=${dev##*/} + echo "[NETWORK] using interface $interface" + fi done + if [ "$ip" ] ; then nettype=${ip##*:} ip=${ip%:*} @@ -44,31 +45,31 @@ fi if [ "$nfsaddrs" -a ! "$(get_param ip)" ]; then - ip=$nfsaddrs + ip=$nfsaddrs fi if [ "$ip" -a ! "$(echo $ip | sed '/:/P;d')" ]; then - echo "[NETWORK] using dhcp on $interface based on ip=$ip" - nettype=dhcp + echo "[NETWORK] using dhcp on $interface based on ip=$ip" + nettype=dhcp elif [ "${ip##*:}" = dhcp ]; then - nettype=dhcp - newinterface="${ip%*:dhcp}" - newinterface="${newinterface##*:}" - [ "$newinterface" != dhcp -a "$newinterface" ] && interface="$newinterface" - echo "[NETWORK] using dhcp on $interface based on ip=$ip" + nettype=dhcp + newinterface="${ip%*:dhcp}" + newinterface="${newinterface##*:}" + [ "$newinterface" != dhcp -a "$newinterface" ] && interface="$newinterface" + echo "[NETWORK] using dhcp on $interface based on ip=$ip" fi if [ "$(get_param dhcp)" -a "$(get_param dhcp)" != "off" ]; then - echo "[NETWORK] using dhcp based on dhcp=$dhcp" - interface=$(get_param dhcp) - nettype=dhcp + echo "[NETWORK] using dhcp based on dhcp=$dhcp" + interface=$(get_param dhcp) + nettype=dhcp fi [ "$(get_param dhcp)" = "off" ] && nettype=static if [ "$ip" -a "$nettype" != "dhcp" ]; then - echo "[NETWORK] using static config based on ip=$ip" - nettype=static + echo "[NETWORK] using static config based on ip=$ip" + nettype=static fi if [[ "$drvlink" = *bonding* ]]; then @@ -92,60 +93,62 @@ # dhcp based ip config if [ "$nettype" = "dhcp" ]; then - # run dhcp - if [ "$interface" != "off" ]; then - echo "running dhcpcd on interface $interface" - dhcpcd -R -Y -N -t 120 $interface - if [ -s /var/lib/dhcpcd/dhcpcd-$interface.info ] ; then - . /var/lib/dhcpcd/dhcpcd-$interface.info - else - echo "no response from dhcp server -- exiting to /bin/sh" - cd / - PATH=$PATH PS1='$ ' /bin/sh -i - fi - [ -e "/var/run/dhcpcd-$interface.pid" ] && kill -9 $(cat /var/run/dhcpcd-$interface.pid) - if [ -n "$DNS" ]; then - oifs="$IFS" - IFS="," - for ns in $DNS ; do - echo "nameserver $ns" >> /etc/resolv.conf - done - IFS="$oifs" - if [ -n "$DOMAIN" ]; then - echo "search $DOMAIN" >> /etc/resolv.conf - fi - echo 'hosts: dns' > /etc/nsswitch.conf - elif [ -n "$DNSSERVERS" ]; then - oifs="$IFS" - IFS=" " - for ns in $DNSSERVERS ; do - echo "nameserver $ns" >> /etc/resolv.conf - done - IFS="$oifs" - if [ -n "$DNSDOMAIN" ]; then - echo "search $DNSDOMAIN" >> /etc/resolv.conf - fi - echo 'hosts: dns' > /etc/nsswitch.conf + # run dhcp + if [ "$interface" != "off" ]; then + echo "running dhcpcd on interface $interface" + dhcpcd -R -Y -N -t 120 $interface + if [ -s /var/lib/dhcpcd/dhcpcd-$interface.info ] ; then + . /var/lib/dhcpcd/dhcpcd-$interface.info + else + echo "no response from dhcp server -- exiting to /bin/sh" + cd / + PATH=$PATH PS1='$ ' /bin/sh -i + fi + [ -e "/var/run/dhcpcd-$interface.pid" ] && kill -9 $(cat /var/run/dhcpcd-$interface.pid) + if [ -n "$DNS" ]; then + oifs="$IFS" + IFS="," + for ns in $DNS ; do + echo "nameserver $ns" >> /etc/resolv.conf + done + IFS="$oifs" + if [ -n "$DOMAIN" ]; then + echo "search $DOMAIN" >> /etc/resolv.conf + fi + echo 'hosts: files dns' > /etc/nsswitch.conf + elif [ -n "$DNSSERVERS" ]; then + oifs="$IFS" + IFS=" " + for ns in $DNSSERVERS ; do + echo "nameserver $ns" >> /etc/resolv.conf + done + IFS="$oifs" + if [ -n "$DNSDOMAIN" ]; then + echo "search $DNSDOMAIN" >> /etc/resolv.conf + fi + echo 'hosts: files dns' > /etc/nsswitch.conf + fi fi - fi # static ip config elif [ "$nettype" = "static" ]; then - # configure interface - if [ -n "$ip" ]; then - /bin/ipconfig $ip - # dhcp information emulation - IPADDR="${ip%%:*}" - ip="${ip#*:}" # first entry => peeraddr - PEERADDR="${ip%%:*}" - ip="${ip#*:}" # first entry => gwaddr - GATEWAY="${ip%%:*}" - ip="${ip#*:}" # first entry => netmask - NETMASK="${ip%%:*}" - ip="${ip#*:}" # first entry => hostname - HOSTNAME="${ip%%:*}" - ip="${ip#*:}" # first entry => iface - INTERFACE="${ip%%:*}" - fi + # configure interface + if [ -n "$ip" ]; then + /bin/ipconfig $ip + # dhcp information emulation + IPADDR="${ip%%:*}" + ip="${ip#*:}" # first entry => peeraddr + PEERADDR="${ip%%:*}" + ip="${ip#*:}" # first entry => gwaddr + GATEWAY="${ip%%:*}" + ip="${ip#*:}" # first entry => netmask + NETMASK="${ip%%:*}" + ip="${ip#*:}" # first entry => hostname + HOSTNAME="${ip%%:*}" + ip="${ip#*:}" # first entry => iface + INTERFACE="${ip%%:*}" + fi + + echo 'hosts: files dns' > /etc/nsswitch.conf fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.5.3/scripts/setup-network.sh new/mkinitrd-2.5.4/scripts/setup-network.sh --- old/mkinitrd-2.5.3/scripts/setup-network.sh 2009-01-21 20:33:43.000000000 +0100 +++ new/mkinitrd-2.5.4/scripts/setup-network.sh 2009-01-22 16:32:17.000000000 +0100 @@ -220,6 +220,10 @@ cp /etc/resolv.conf $tmp_mnt/etc fi +# Copy /etc/hosts in any case to be able to resolve static host names in the +# initrd (bnc #468090) +cp /etc/hosts $tmp_mnt/etc + # Get static IP configuration if requested if [ "$interface" -a "$nettype" = "static" ] ; then ip=$(get_ip_config $interface) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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