Hi release team Per request from Neil on IRC I give you a debdiff for the two packages. After reading the last release update I was under the impression that you want to generate the debdiff yourself anyway..., sorry. Gaudenz yaboot: diff -u yaboot-1.3.13a/debian/changelog yaboot-1.3.13a/debian/changelog --- yaboot-1.3.13a/debian/changelog +++ yaboot-1.3.13a/debian/changelog @@ -1,3 +1,15 @@ +yaboot (1.3.13a-1squeeze1) testing-proposed-updates; urgency=low + + * Team upload. + * Get scsi, sata, and firewire drive info from sysfs as legacy /proc/scsi + interface does not exist anymore. + (Closes: #572869, #377097, #342833, #289201) + * Use persistent device naming symlinks, UUID and LABEL tags instead of + unix block device names. (Closes: #580455) + * debian/copyright: Add copyright notice from ofpath. + + -- Milan Kupcevic <milan@physics.harvard.edu> Sun, 05 Dec 2010 10:34:50 -0500 + yaboot (1.3.13a-1) unstable; urgency=high * Convert debian/control from ISO_8859-15 to UTF-8. diff -u yaboot-1.3.13a/debian/copyright yaboot-1.3.13a/debian/copyright --- yaboot-1.3.13a/debian/copyright +++ yaboot-1.3.13a/debian/copyright @@ -33,6 +33,11 @@ ### +## ofpath: determine OpenFirmware path from unix device node +## Copyright (C) 2010 Milan Kupcevic +## Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson +## Copyright (C) 2000 Olaf Hering <olh@suse.de> + ## ybin (YaBoot INstaller) installs/updates the yaboot bootloader. ## Copyright (C) 2000, 2001 Ethan Benson diff -u yaboot-1.3.13a/ybin/ofpath yaboot-1.3.13a/ybin/ofpath --- yaboot-1.3.13a/ybin/ofpath +++ yaboot-1.3.13a/ybin/ofpath @@ -3,6 +3,9 @@ ############################################################################### ## ## ofpath: determine OpenFirmware path from unix device node +## +## Copyright (C) 2010 Milan Kupcevic +## ## Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson ## ## Portions based on show_of_path.sh: @@ -27,7 +30,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" PRG="${0##*/}" -VERSION=1.0.7 +VERSION=1.0.7+debian1 DEBUG=0 export LC_COLLATE=C @@ -36,9 +39,10 @@ { echo \ "$PRG $VERSION -Written by Ethan Benson +Written by Ethan Benson, portions rewritten by Milan Kupcevic Portions based on show_of_path.sh written by Olaf Hering +Copyright (C) 2010 Milan Kupcevic Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson Portions Copyright (C) 2000 Olaf Hering This is free software; see the source for copying conditions. There is NO @@ -181,140 +185,124 @@ return 0 } +# read OpenFirmware device path from its corresponding devspec +find_of_path() +{ + [ -z "$1" ] && return + [ -f "$1/devspec" ] && { + OF_PATH="`cat $1/devspec`" + SYS_PATH="$1" + return + } + find_of_path "${1%/*}" +} + ## this finds information we need on both newworld and oldworld macs. ## mainly what scsi host a disk is attached to. scsiinfo() { - ## see if system has scsi at all - if [ ! -f /proc/scsi/scsi ] ; then - local kver="$(uname -r)" - case "$kver" in - 2.5.*|2.6.*) - if [ -d /sys/bus/scsi/devices -a \ - -n "$(ls /sys/bus/scsi/devices 2>/dev/null)" ] ; then - echo 1>&2 "$PRG: /proc/scsi/scsi does not exist" - echo 1>&2 "$PRG: Make sure you compiled your kernel with CONFIG_SCSI_PROC_FS=y" - return 1 - fi - ;; - esac - echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured" - return 1 - fi - - ## first we have to figure out the SCSI ID, have to do that - ## anyway [to] find the attached scsi disks = "Direct-Access" and - ## stop at sda=1 sdb=2 or whatever count in 3 lines steps - - ## get last letter of device node, ie sda -> a - SUBNODE=${DEVNODE##*sd} - - ## turn SUBNODE above into a number starting at 1, ie a -> 1 - SUBDEV="$(smalltr $SUBNODE)" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: SUBNODE=$SUBNODE SUBDEV=$SUBDEV" - - DEVCOUNT=0 - - ## copy scsi file into a variable removing "Attached Devices" - ## which is the first line. this avoids a lot of - ## [incmopatible] crap later, and improves readability. - - ## find number of lines once and recycle that number, to save - ## some time (linecount is a bit slow). subtract one line - ## to scrap Attached Devices: - - SCSILINES="$(($(linecount /proc/scsi/scsi) - 1))" - - if [ "$SUBDEV" -gt "$(cat /proc/scsi/scsi | grep Direct-Access | linecount)" ] ; then - echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured" - return 1 - fi - - PROCSCSI="$(cat /proc/scsi/scsi | tail -n $SCSILINES)" - - for i in $(smallseq $(($SCSILINES / 3))) ; do - - ## put every scsi device into one single line - DEVINFO="$(echo "$PROCSCSI" | head -n $(($i * 3)) | tail -n 3)" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVINFO=$DEVINFO" - - ## cut the type field, expect "Direct-Access" later. - DEVTYPE="$(v=$(echo ${DEVINFO##*Type: }) ; echo ${v%% *})" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVTYPE=$DEVTYPE" - - ## get the device id. - DEVID="$(v=$(echo ${DEVINFO##*Id: }) ; n=$(echo ${v%% *}) ; echo ${n#*0})" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVID=$DEVID" - - ## get the scsi host id. - DEVHOST="$(v=$(echo ${DEVINFO##*Host: scsi}) ; echo ${v%% *})" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVHOST=$DEVHOST" - - if [ "$DEVTYPE" = "Direct-Access" ] ; then - DEVCOUNT="$(($DEVCOUNT + 1))" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVCOUNT=$DEVCOUNT" - if [ "$SUBDEV" = "$DEVCOUNT" ] ; then - DEVICE_HOST=$DEVHOST - DEVICE_ID=$DEVID - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVICE_HOST=$DEVICE_HOST" - break - fi - fi - done - - ## figure out what the scsi driver is, it is /proc/scsi/dirname. - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVICE_HOST=$DEVICE_HOST" - SCSI_DRIVER="$(x=`ls /proc/scsi/*/$DEVICE_HOST 2>/dev/null | cat` ; y=`echo ${x##*proc/scsi/}` ; echo ${y%%/*})" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: SCSI_DRIVER=$SCSI_DRIVER" - - ## figure out which host we found. - SCSI_HOSTNUMBER="$(v=`ls /proc/scsi/$SCSI_DRIVER/* 2>/dev/null | cat | grep -n "$DEVICE_HOST\>"` ; echo ${v%%:*})" - [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: SCSI_HOSTNUMBER=$SCSI_HOSTNUMBER" + + SYS_DEVICE="`readlink -f /sys/block/$DEVNODE/device`" + + [ -e "$SYS_DEVICE" ] && { + + SCSI_DEVICE=${SYS_DEVICE##*/} + HOST_ID=${SCSI_DEVICE%%:*} + BUS_ID=`T=${SCSI_DEVICE#*:}; echo ${T%%:*}` + DEVICE_ID=`T=${SCSI_DEVICE#*:*:}; echo ${T%%:*}` + LUN_ID=${SCSI_DEVICE##*:} + + OF_PATH=;find_of_path "$SYS_DEVICE" + + SCSI_DRIVER=`cat /sys/class/scsi_host/host$HOST_ID/proc_name 2>/dev/null` + + SCSI_NAME=`cat /proc/device-tree$OF_PATH/name 2>/dev/null` + + IEEE1394_ID=`cat /sys/block/$DEVNODE/device/ieee1394_id 2>/dev/null` + IEEE1394_ID=${IEEE1394_ID%%:*} + + PLUG_ID=$(ls -dv $SYS_PATH/host* 2>/dev/null | grep -n "/host$HOST_ID$") + PLUG_ID=$((${PLUG_ID%%:*}-1)) + + PART=${PARTITION:+:$PARTITION} + + [ "$LUN_ID" != "0" ] && LUNX=`printf ",%x" $LUN_ID` + + [ "$DEBUG" = "1" ] && { + echo SYS_DEVICE=$SYS_DEVICE + echo SCSI_DEVICE=$SCSI_DEVICE + echo HOST_ID=$HOST_ID + echo BUS_ID=$BUS_ID + echo DEVICE_ID=$DEVICE_ID + echo LUN_ID=$LUN_ID + echo PLUG_ID=$PLUG_ID + echo IEEE1394_ID=$IEEE1394_ID + echo SCSI_NAME=$SCSI_NAME + echo SCSI_DRIVER=$SCSI_DRIVER + echo SYS_PATH=$SYS_PATH + echo OF_PATH=$OF_PATH + echo PART=$PART + echo LUNX=$LUNX + } + + SCSI_DRIVER=${SCSI_DRIVER:?} + + [ -z "$OF_PATH" ] && { + echo 1>&2 "Cannot find $DEVNODE among OpenFirmware registered devices" + + exit 1 + } return 0 + } + + echo 1>&2 "Link /sys/block/$DEVNODE/device does not exist" + + exit 1 } -## generic function that can find OF device paths for scsi devices, +## add OF device node to the host OF path, ## must be run after scsiinfo(). scsi_ofpath() { - case "$SCSI_DRIVER" in - aic7xxx) - HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do - lgrep "$i" "^ADPT" "^pci900[45]" "^pciclass,01000" ; done)" - DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" - echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION" - ;; - sym53c8xx) - HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do - lgrep "$i" "^Symbios" "^pci1000" "^pciclass,01000" ; done)" - DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" - echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION" - ;; - mesh) - HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do - lgrep "$i" "mesh" ; done)" - DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" - echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION" - ;; - ata_k2|sata_svw) - HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do - lgrep "$i" "k2-sata" ; done | sort)" - DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" - echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION" - ;; - sbp2) - HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do - lgrep "$i" "sbp-2" ; done)" - DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" - echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION" - ;; - *) - echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported" - return 1 - ;; + + if [ -d "/proc/device-tree$OF_PATH/sas" ] ; then + + SAS_ID=$(( ($BUS_ID << 16) | ($DEVICE_ID << 8) | $LUN_ID)) + printf "%s/sas/disk@%x%s\n" $OF_PATH $SAS_ID $LUNX$PART + + elif [ -d "/proc/device-tree$OF_PATH/scsi@`printf %x $BUS_ID`" ] ; then + + printf "%s/scsi@%x/@%x%s\n" $OF_PATH $BUS_ID $DEVICE_ID $LUNX$PART + + else + + case "$SCSI_DRIVER-$SCSI_NAME" in + aic7xxx-*|sym53c8xx-*|mesh-*|*-scsi) + printf "%s/@%x%s\n" $OF_PATH $DEVICE_ID $LUNX$PART + ;; + sata_sil-*|sata_vsc-*) + printf "%s/@%x%s\n" $OF_PATH $(($PLUG_ID * 2)) $PART + ;; + sata_svw-*|*-pci-ata) + printf "%s/@%x/@%x%s\n" $OF_PATH $PLUG_ID $DEVICE_ID $PART + ;; + sbp2-*) + IEEE1394_ID=${IEEE1394_ID:?} + printf "%s/node@%s/sbp-2/@%x%s\n" $OF_PATH $IEEE1394_ID $DEVICE_ID $PART + ;; + ipr-obsidian) + printf "%s/@%x,%x%s\n" $OF_PATH $BUS_ID $DEVICE_ID $LUNX$PART + ;; + *) + echo 1>&2 "${PRG}: ${SCSI_NAME} (${SCSI_DRIVER}) is not supported" + return 1 + ;; esac - return 0 + + fi + + return 0 } ide_ofpath() @@ -414,11 +402,11 @@ case "$DEVNODE" in hda|hdc|hde|hdg|hdi|hdk|hdm|hdo) - echo "${DEVSPEC}${MASTER}:$PARTITION" + echo "${DEVSPEC}${MASTER}${PARTITION:+:${PARTITION}}" return 0 ;; hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp) - echo "${DEVSPEC}${SLAVE}:$PARTITION" + echo "${DEVSPEC}${SLAVE}${PARTITION:+:${PARTITION}}" return 0 ;; *) @@ -669,12 +657,6 @@ { case "$DEVNODE" in sd*) - if ls -l /proc/device-tree | grep -q ^lr ; then - true - else - echo 1>&2 "$PRG: /proc/device-tree is broken." - return 1 - fi ## use common scsiinfo function to get info we need. scsiinfo || return 1 only in patch2: unchanged: --- yaboot-1.3.13a.orig/ybin/ybin +++ yaboot-1.3.13a/ybin/ybin @@ -1589,6 +1589,13 @@ exit 1 fi +## also accept symlink names in quotes or with escaped characters +boot="`readlink -f \"$(eval echo ${boot})\"`" +bsd="`readlink -f \"$(eval echo ${bsd})\"`" +macos="`readlink -f \"$(eval echo ${macos})\"`" +macosx="`readlink -f \"$(eval echo ${macosx})\"`" +darwin="`readlink -f \"$(eval echo ${darwin})\"`" + ## if there is still no config file use the automatic generation to make a ## generic yaboot.conf. do this before the confcheck to avoid wierd errors. if [ "$bootconf" = /dev/null ] ; then only in patch2: unchanged: --- yaboot-1.3.13a.orig/ybin/yabootconfig +++ yaboot-1.3.13a/ybin/yabootconfig @@ -27,7 +27,7 @@ PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin" fi PRG="${0##*/}" -VERSION=1.0.8 +VERSION=1.0.8+debian1 CHROOT=/ ## $CONFIG is relative to $CHROOT CONFIG=etc/yaboot.conf @@ -720,6 +720,27 @@ INITRDIMGS="\tinitrd=$INITRDIMG\n\tinitrd-size=8192\n" fi +## Get a symlink which always points to the correct block device. +## If it does not exist, give the unix block device name back. +devsymlink() { + [ "$2" != "nobyid" ] && BYID="/dev/disk/by-id/scsi* /dev/disk/by-id/*" + for SYMLINK in $BYID /dev/disk/by-uuid/* /dev/disk/by-label/*; do + [ "`readlink -f "$SYMLINK"`" = "$1" ] && { + echo $SYMLINK + return + } + done + echo $1 +} + +## Get UUID= or LABEL= for the given unix partition block device. +## If it could not be determined, give the unix partition block device back. +uuidlabel() { + echo `devsymlink "$1" nobyid` \ + | sed -e "s,/dev/disk/by-uuid/,UUID=," \ + -e "s,/dev/disk/by-label/,LABEL=," +} + ## generate global section of yaboot.conf GLOBAL="## yaboot.conf generated by $PRG $VERSION ## @@ -727,9 +748,9 @@ ${HEADER}## ## For a dual-boot menu, add one or more of: ## bsd=/dev/hdaX, macos=/dev/hdaY, macosx=/dev/hdaZ\n -boot=${BOOT}${DEVICE:-} +boot=\"`devsymlink "${BOOT}"`\"${DEVICE:-} partition=$PARTITION -root=$ROOT +root=\"`uuidlabel "${ROOT}"`\" timeout=30 install=${INSTALL}${OFBOOT:-}\n" yaboot-installer (generated from d-i SVN, changelog will be fixed before upload): iff -Nru yaboot-installer-1.1.18/debian/changelog yaboot-installer-1.1.19/debian/changelog --- yaboot-installer-1.1.18/debian/changelog 2010-11-12 19:04:10.000000000 +0100 +++ yaboot-installer-1.1.19/debian/changelog 2010-12-07 23:12:21.000000000 +0100 @@ -1,3 +1,11 @@ +yaboot-installer (1.1.19) UNRELEASED; urgency=low + + * Use short OS labels returned by os-prober instead of long titles for yaboot + image boot labels. + * Use device ids instead of unix block names (Closes: #57925) + + -- Milan Kupcevic <milan@physics.harvard.edu> Sat, 27 Nov 2010 12:03:03 -0500 + yaboot-installer (1.1.18) unstable; urgency=low [ Updated translations ] diff -Nru yaboot-installer-1.1.18/debian/po/de.po yaboot-installer-1.1.19/debian/po/de.po --- yaboot-installer-1.1.18/debian/po/de.po 2010-05-22 21:08:26.000000000 +0200 +++ yaboot-installer-1.1.19/debian/po/de.po 2010-12-06 14:26:14.000000000 +0100 @@ -3,7 +3,7 @@ # # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # -# German messages for debian-installer. +# German messages for debian-installer (sublevel1). # Copyright (C) 2003 Software in the Public Interest, Inc. # Console-setup strings translations: # (identified by "./console-setup.templates") @@ -25,7 +25,7 @@ "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-01-26 07:32+0000\n" -"PO-Revision-Date: 2010-04-12 17:01+0100\n" +"PO-Revision-Date: 2010-10-02 22:33+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -172,7 +172,7 @@ #. :sl4: #: ../yaboot-installer.templates:11001 msgid "The creation of the main yaboot configuration file failed." -msgstr "Die Yaboot-Hauptkonfiguration konnte nicht erzeugt werden." +msgstr "Die Hauptdatei der Yaboot-Konfiguration konnte nicht erzeugt werden." #. Type: error #. Description diff -Nru yaboot-installer-1.1.18/debian/po/lo.po yaboot-installer-1.1.19/debian/po/lo.po --- yaboot-installer-1.1.18/debian/po/lo.po 1970-01-01 01:00:00.000000000 +0100 +++ yaboot-installer-1.1.19/debian/po/lo.po 2010-12-06 14:26:14.000000000 +0100 @@ -0,0 +1,308 @@ +# THIS FILE IS GENERATED AUTOMATICALLY FROM THE D-I PO MASTER FILES +# The master files can be found under packages/po/ +# +# DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST +# +# translation of lo.po to Lao +# Lao translation of debian-installer. +# Copyright (C) 2006-2010 Software in the Public Interest, Inc. +# This file is distributed under the same license as debian-installer. +# +# Anousak Souphavanh <anousak@gmail.com>, 2010. +msgid "" +msgstr "" +"Project-Id-Version: lo\n" +"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" +"POT-Creation-Date: 2008-01-26 07:32+0000\n" +"PO-Revision-Date: 2010-11-26 09:11+0700\n" +"Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n" +"Language-Team: Lao <lo@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:1001 +#, fuzzy +msgid "Installing Yaboot" +msgstr "ກຳລັງຕິດຕັ້ງບູຕໂຫລດເດີ GRUB" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:2001 +#, fuzzy +msgid "Installing Yaboot boot loader" +msgstr "ກຳລັງຕິດຕັ້ງບູຕໂຫລດເດີ GRUB" + +#. Type: boolean +#. Description +#. :sl4: +#: ../yaboot-installer.templates:3001 +#, fuzzy +msgid "Yaboot installation failed. Continue anyway?" +msgstr "ຕິດຕັ້ງ ELILO ບໍ່ສຳເລັດຈະດຳເນີນການຕໍ່ໄປຫລືບໍ່?" + +#. Type: boolean +#. Description +#. :sl4: +#: ../yaboot-installer.templates:3001 +#, fuzzy +msgid "" +"The yaboot package failed to install into /target/. Installing Yaboot as a " +"boot loader is a required step. The install problem might however be " +"unrelated to Yaboot, so continuing the installation may be possible." +msgstr "" +"ຕິດຕັ້ງແພກເກັດ CoLo ລົງໃນ /target/ ບໍ່ສຳເລັດ ການຕິດຕັ້ງ CoLo ເປັນບູຕໂຫລດເດີ ເປັນຂັ້ນຕອນທີ່ຈຳເປັນ " +"ແຕ່ປັນຫາຂອງການຕິດຕັ້ງອາດບໍ່ກ່ຽວກັບ ໂຫລດ CoLo ກໍ່ໄດ້ ດັ່ງນັ້ນ ການດຳເນີນການຕິດຕັ້ງຕໍ່ໄປກໍ່ອາດເຮັດໄດ້" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:4001 +#, fuzzy +msgid "Looking for bootstrap partitions" +msgstr " ຕຳແໜ່ງເມົາສຳລັບພາທິຊັນນີ້:" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:5001 +#, fuzzy +msgid "No bootstrap partition found" +msgstr "ບໍ່ເຫັນພາທິຊັນສຳຫລັບບູຕ" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:5001 +msgid "" +"No hard disks were found which have an \"Apple_Bootstrap\" partition. You " +"must create an 819200-byte partition with type \"Apple_Bootstrap\"." +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:6001 +#, fuzzy +msgid "Looking for root partition" +msgstr "ຕຳແໜ່ງຂອງພາທິຊັນໃໝ່:" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:7001 +#, fuzzy +msgid "No root partition found" +msgstr "ບໍ່ເຫັນພາທິຊັນສຳຫລັບບູຕ" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:7001 +msgid "" +"No partition is mounted as your new root partition. You must mount a root " +"partition first." +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:8001 +#, fuzzy +msgid "Looking for other operating systems" +msgstr "ກຳລັງກວດຫາລະບົບປະຕິບັດການອື່ນ..." + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "Device for boot loader installation:" +msgstr "ອຸປະກອນສຳລັບຕິດຕັ້ງບູດໂຫຼດເດີ:" + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "" +"Yaboot (the Linux boot loader) needs to be installed on a hard disk " +"partition in order for your system to be bootable. Please choose the " +"destination partition from among these partitions that have the bootable " +"flag set." +msgstr "" + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "Warning: this will erase all data on the selected partition!" +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:10001 +#, fuzzy +msgid "Creating yaboot configuration" +msgstr "ກຳລັງຕັ້ງຄ່າໃຫ້ກັບ CoLo" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 +#, fuzzy +msgid "Failed to create yaboot configuration" +msgstr "ດືງແຟັມຄ່າຕັ້ງລວ່ງໜ້າບໍ່ສຳເລັດ" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 +msgid "The creation of the main yaboot configuration file failed." +msgstr "" + +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 ../yaboot-installer.templates:13001 +#: ../yaboot-installer.templates:15001 +msgid "Check /var/log/syslog or see virtual console 4 for the details." +msgstr "ກະລຸນາກວດສອບ /var/log/syslog ຫຼືເບີ່ງທີ່ຄອນໂຊຄວາມແທ້ຈິງທີ 4 ເພື່ອເບິ່ງລາຍລະອຽດ." + +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 ../yaboot-installer.templates:13001 +#: ../yaboot-installer.templates:15001 +msgid "Warning: Your system may be unbootable!" +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:12001 +msgid "Installing yaboot into bootstrap partition" +msgstr "" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:13001 +#, fuzzy +msgid "Failed to install boot loader" +msgstr "ຕິດຕັ້ງບູດໂຫຼດເດີ GRUB ໃໝ່" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:13001 +#, fuzzy +msgid "The installation of the yaboot boot loader failed." +msgstr "ກຳລັງຕິດຕັ້ງບູຕໂຫລດເດີ Cobalt " + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +msgid "Successfully installed yaboot" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +msgid "The yaboot boot loader was successfully installed." +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +msgid "The new system is now ready to boot." +msgstr "" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:15001 +#, fuzzy +msgid "Failed to mount /target/proc" +msgstr "ບໍ່ສຳເລັດໃນການເຊີ່ມຟຣອບປີິ້ດີສ໌" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:15001 +#, fuzzy +msgid "Mounting the proc file system on /target/proc failed." +msgstr "ຕິດຕັ້ງລະບົບພື້ນຖານລົງໃນ /target/ ບໍ່ສຳເລັດ" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "Setting firmware variables for automatic boot" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"Some variables need to be set in the Genesi firmware in order for your " +"system to boot automatically. At the end of the installation, the system " +"will reboot. At the firmware prompt, set the following firmware variables " +"to enable auto-booting:" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"You will only need to do this once. Afterwards, enter the \"boot\" command " +"or reboot the system to proceed to your newly installed system." +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"Alternatively, you will be able to boot the kernel manually by entering, at " +"the firmware prompt:" +msgstr "" + +#. Type: text +#. Description +#. Main menu item +#. :sl4: +#: ../yaboot-installer.templates:17001 +#, fuzzy +msgid "Install yaboot on a hard disk" +msgstr "ຕິດຕັ້ງບູຕໂຫລດເດີ Cobalt ລົງໃນຮາດດີສ໌" + +#. Type: text +#. Description +#. Rescue menu item +#. :sl4: +#: ../yaboot-installer.templates:18001 +#, fuzzy +msgid "Reinstall yaboot boot loader" +msgstr "ຕິດຕັ້ງບູດໂຫຼດເດີ GRUB ໃໝ່" diff -Nru yaboot-installer-1.1.18/debian/po/si.po yaboot-installer-1.1.19/debian/po/si.po --- yaboot-installer-1.1.18/debian/po/si.po 1970-01-01 01:00:00.000000000 +0100 +++ yaboot-installer-1.1.19/debian/po/si.po 2010-12-06 14:26:14.000000000 +0100 @@ -0,0 +1,316 @@ +# THIS FILE IS GENERATED AUTOMATICALLY FROM THE D-I PO MASTER FILES +# The master files can be found under packages/po/ +# +# DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST +# +# +# +# Debian Installer master translation file template +# Don't forget to properly fill-in the header of PO files +# +# Debian Installer translators, please read the D-I i18n documentation +# in doc/i18n/i18n.txt +# +# +# Danishka Navin <danishka@gmail.com>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: debian-installer\n" +"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" +"POT-Creation-Date: 2008-01-26 07:32+0000\n" +"PO-Revision-Date: 2010-11-13 23:01+0530\n" +"Last-Translator: Danishka Navin <danishka@gmail.com>\n" +"Language-Team: Sinhala <info@hanthana.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: si\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:1001 +#, fuzzy +msgid "Installing Yaboot" +msgstr "GRUB ඇරඹුම්කාරකය ස්ථාපනය කරමින්" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:2001 +#, fuzzy +msgid "Installing Yaboot boot loader" +msgstr "GRUB ඇරඹුම්කාරකය ස්ථාපනය කරමින්" + +#. Type: boolean +#. Description +#. :sl4: +#: ../yaboot-installer.templates:3001 +#, fuzzy +msgid "Yaboot installation failed. Continue anyway?" +msgstr "ELILO ස්ථාපකය ස්ථාපනය අසමත්විය. කෙසෙහෝ ක්රියාත්මක වන්න ද?" + +#. Type: boolean +#. Description +#. :sl4: +#: ../yaboot-installer.templates:3001 +#, fuzzy +msgid "" +"The yaboot package failed to install into /target/. Installing Yaboot as a " +"boot loader is a required step. The install problem might however be " +"unrelated to Yaboot, so continuing the installation may be possible." +msgstr "" +"CoLo පැකේජය /target/ ට ස්ථාපනය වීම අසාර්ථක විය. පණගැන්වුම් ප්රවේශනයක් ලෙස CoLo ස්ථාපනය " +"අවශ්ය පියවරකි. කෙසේ වෙතත් ස්ථාපන ප්රශ්නය CoLo ට අදාළ විය හැක. එම නිසා ස්ථාපනය දිගටම " +"කරගෙන යාමට හැක." + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:4001 +#, fuzzy +msgid "Looking for bootstrap partitions" +msgstr "මෙම කොටස සඳහා රැඳවුම් ස්ථානය" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:5001 +#, fuzzy +msgid "No bootstrap partition found" +msgstr "කිසිඳු කොටසක් හමු නොවිනි" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:5001 +msgid "" +"No hard disks were found which have an \"Apple_Bootstrap\" partition. You " +"must create an 819200-byte partition with type \"Apple_Bootstrap\"." +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:6001 +#, fuzzy +msgid "Looking for root partition" +msgstr "නව කොටස සඳහා පිහිටුම:" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:7001 +#, fuzzy +msgid "No root partition found" +msgstr "කිසිඳු කොටසක් හමු නොවිනි" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:7001 +msgid "" +"No partition is mounted as your new root partition. You must mount a root " +"partition first." +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:8001 +#, fuzzy +msgid "Looking for other operating systems" +msgstr "අනෙකුත් මෙහෙයුම් පද්ධති සඳහා සොයමින්..." + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "Device for boot loader installation:" +msgstr "ආරම්භක පූරක ස්ථාපනය සඳහා උපකරණය:" + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "" +"Yaboot (the Linux boot loader) needs to be installed on a hard disk " +"partition in order for your system to be bootable. Please choose the " +"destination partition from among these partitions that have the bootable " +"flag set." +msgstr "" + +#. Type: select +#. Description +#. :sl4: +#: ../yaboot-installer.templates:9001 +msgid "Warning: this will erase all data on the selected partition!" +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:10001 +#, fuzzy +msgid "Creating yaboot configuration" +msgstr "CoLo සැකසුම් නිර්මාණය කරමින්" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 +#, fuzzy +msgid "Failed to create yaboot configuration" +msgstr "පෙර සැකසුම් ගොනුව ලබාගැනීම අසාර්ථක විය" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 +msgid "The creation of the main yaboot configuration file failed." +msgstr "" + +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 ../yaboot-installer.templates:13001 +#: ../yaboot-installer.templates:15001 +msgid "Check /var/log/syslog or see virtual console 4 for the details." +msgstr "තොරතුරු සඳහා /var/log/syslog හෝ 4 වැනි අතත්ය කොන්සෝලය පිරික්සන්න." + +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:11001 ../yaboot-installer.templates:13001 +#: ../yaboot-installer.templates:15001 +msgid "Warning: Your system may be unbootable!" +msgstr "" + +#. Type: text +#. Description +#. :sl4: +#: ../yaboot-installer.templates:12001 +#, fuzzy +msgid "Installing yaboot into bootstrap partition" +msgstr "/boot කොටස නොමැතිව ස්ථාපනය කරන්නද?" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:13001 +#, fuzzy +msgid "Failed to install boot loader" +msgstr "GRUB ආරම්භක පූරකය නැවත ස්ථාපනය කරන්න" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:13001 +#, fuzzy +msgid "The installation of the yaboot boot loader failed." +msgstr "Cobalt ස්ථාපකය ස්ථාපනය අසමත්විය." + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +msgid "Successfully installed yaboot" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +#, fuzzy +msgid "The yaboot boot loader was successfully installed." +msgstr "කිසිඳු ආරම්භක පූරකයක් ස්ථාපනය කර නොමැත" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:14001 +msgid "The new system is now ready to boot." +msgstr "" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:15001 +#, fuzzy +msgid "Failed to mount /target/proc" +msgstr "මෘදු තැටිය එක් කිරීම අසමත් විය" + +#. Type: error +#. Description +#. :sl4: +#: ../yaboot-installer.templates:15001 +#, fuzzy +msgid "Mounting the proc file system on /target/proc failed." +msgstr "/ඉලක්කය/ වෙත මූල පද්ධතිය ස්ථාපනය කිරීම අසාර්ථකයි. " + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "Setting firmware variables for automatic boot" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"Some variables need to be set in the Genesi firmware in order for your " +"system to boot automatically. At the end of the installation, the system " +"will reboot. At the firmware prompt, set the following firmware variables " +"to enable auto-booting:" +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"You will only need to do this once. Afterwards, enter the \"boot\" command " +"or reboot the system to proceed to your newly installed system." +msgstr "" + +#. Type: note +#. Description +#. :sl4: +#: ../yaboot-installer.templates:16001 +msgid "" +"Alternatively, you will be able to boot the kernel manually by entering, at " +"the firmware prompt:" +msgstr "" + +#. Type: text +#. Description +#. Main menu item +#. :sl4: +#: ../yaboot-installer.templates:17001 +#, fuzzy +msgid "Install yaboot on a hard disk" +msgstr "Cobalt ඇරඹුම්කාරකය දෘඩ තැටියක ස්ථාපනය කරන්න" + +#. Type: text +#. Description +#. Rescue menu item +#. :sl4: +#: ../yaboot-installer.templates:18001 +#, fuzzy +msgid "Reinstall yaboot boot loader" +msgstr "GRUB ආරම්භක පූරකය නැවත ස්ථාපනය කරන්න" diff -Nru yaboot-installer-1.1.18/debian/po/sl.po yaboot-installer-1.1.19/debian/po/sl.po --- yaboot-installer-1.1.18/debian/po/sl.po 2010-03-26 13:18:59.000000000 +0100 +++ yaboot-installer-1.1.19/debian/po/sl.po 2010-12-06 14:26:14.000000000 +0100 @@ -25,7 +25,7 @@ "Project-Id-Version: sl\n" "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n" "POT-Creation-Date: 2008-01-26 07:32+0000\n" -"PO-Revision-Date: 2010-03-02 11:07+0100\n" +"PO-Revision-Date: 2010-11-16 15:21+0100\n" "Last-Translator: Vanja Cvelbar <cvelbar@gmail.com>\n" "Language-Team: Slovenian <gnome-si@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -265,7 +265,7 @@ #. :sl4: #: ../yaboot-installer.templates:16001 msgid "Setting firmware variables for automatic boot" -msgstr "Nastavljanje firmware spremenljivk za samodejni zagon" +msgstr "Nastavljanje spremenljivk strojne programske opreme za samodejni zagon" #. Type: note #. Description @@ -277,9 +277,10 @@ "will reboot. At the firmware prompt, set the following firmware variables " "to enable auto-booting:" msgstr "" -"V Genesi firmwareu je potrebno nastaviti nekatere spremenljivke. Na koncu " -"namestitve se bo sistem ponovno zagnal. Ob pozivniku firmwarea nastavite " -"sledeče spremenljivke, da boste omogočili samodejni zagon:" +"V strojni programski opremi Genesi je potrebno nastaviti nekatere " +"spremenljivke. Na koncu namestitve se bo sistem ponovno zagnal. Ob pozivniku " +"strojne programske opreme nastavite sledeče spremenljivke, da boste " +"omogočili samodejni zagon:" #. Type: note #. Description @@ -289,7 +290,7 @@ "You will only need to do this once. Afterwards, enter the \"boot\" command " "or reboot the system to proceed to your newly installed system." msgstr "" -"To boste morali storiti samo enkrat. Kasneje, vnesite \"boot\" ukaz ali " +"To boste morali storiti samo enkrat. Kasneje, vnesite ukaz \"boot\" ali " "ponovno zaženite računalnik za nadaljevanje z naslednjim namestitvenim " "korakom." diff -Nru yaboot-installer-1.1.18/debian/postinst yaboot-installer-1.1.19/debian/postinst --- yaboot-installer-1.1.18/debian/postinst 2009-07-23 19:00:19.000000000 +0200 +++ yaboot-installer-1.1.19/debian/postinst 2010-12-06 14:29:44.000000000 +0100 @@ -240,6 +240,27 @@ chroot /target ofpath "$1" || return 1 } +# Get a symlink which always points to the correct block device. +# If it does not exist, give the unix block device name back. +devsymlink() { + [ "$2" != "nobyid" ] && BYID="/dev/disk/by-id/scsi* /dev/disk/by-id/*" + for SYMLINK in $BYID /dev/disk/by-uuid/* /dev/disk/by-label/*; do + [ "`readlink -f "$SYMLINK"`" = "$1" ] && { + echo $SYMLINK + return + } + done + echo $1 +} + +# Get UUID= or LABEL= for the given unix partition block device. +# If it could not be determined, give the unix partition block device back. +uuidlabel() { + echo `devsymlink "$1" nobyid` \ + | sed -e "s,/dev/disk/by-uuid/,UUID=," \ + -e "s,/dev/disk/by-label/,LABEL=," +} + OLDIFS="$IFS" IFS=: # Note that this creates a subshell, so variables set inside this loop won't @@ -255,10 +276,10 @@ linux) IFS=: linux-boot-prober "$partition" | while read \ - rootpart bootpart label kernel initrd params; do + rootpart bootpart oldlabel kernel initrd params; do IFS="$OLDIFS" info "linux-boot-probed:" \ - "$rootpart:$bootpart:$label:$kernel:$initrd:$params" + "$rootpart:$bootpart:$oldlabel:$kernel:$initrd:$params" ofrootpart="$(map_of_path "$mappedpartition")" || continue debug "OF root partition: $ofrootpart" # bootpart may or may not be in devfs syntax. @@ -268,12 +289,10 @@ ofbootpart="$(map_of_path "$mappedbootpart")" || continue debug "OF boot partition: $ofbootpart" if [ -z "$label" ]; then - label="$title" + label="$oldlabel" fi - # Prepend the last part of the partition name to the label, - # for uniqueness and (I hope) clarity, given that we don't - # have a way to display a useful description in yaboot. - label="${mappedbootpart##*/}-$label" + # remove root parameter from params + params="`echo $params | sed -e "s,root=[^[:space:]]*,,"`" if echo "$kernel" | grep -q '^/boot/' && \ [ "$mappedbootpart" != "$mappedpartition" ]; then # separate /boot partition @@ -286,7 +305,7 @@ # Linux installation on $mappedpartition. image=$ofbootpart,$kernel label=$label - root=$ofrootpart + root="`uuidlabel "$mappedpartition"`" append="$params" EOF if [ -n "$initrd" ]; then @@ -301,13 +320,13 @@ macosx) if ! [ "$macosx" ]; then macosx=1 - echo "macosx=$mappedpartition" | writeglobals + echo "macosx=\"`devsymlink "$mappedpartition"`\"" | writeglobals fi ;; macos) if ! [ "$macos" ]; then macos=1 - echo "macos=$mappedpartition" | writeglobals + echo "macos=\"`devsymlink "$mappedpartition"`\"" | writeglobals fi ;; *) @@ -412,7 +431,7 @@ if [ "$boot" ]; then writeyabootconf <<EOF -boot=$boot +boot="`devsymlink "$boot"`" EOF fi @@ -425,7 +444,7 @@ fi writeyabootconf <<EOF partition=$partnr -root=$root +root="`uuidlabel "$root"`" timeout=$timeout install=$yaboot_location EOF Excerpts from Gaudenz Steinlin's message of Mon Dez 06 13:50:16 +0100 2010: > Hi release team > > I ask you for pre approval of a yaboot (Powerpc Bootloader) upload to > testing-proposed-updates. The package in unstable unfortunately > contains a new upstream version and is therefore not suitable for > squeeze. > > The upload would fix the following RC bugs: > > #572869 [S|+|=♔] [yaboot] installation-reports: PowerMac G5 > installation report: ofpath doesn't work in the absence of > /proc/scsi/scsi > > #580455 [S|+|=♔] [yaboot] lastest Sid upgrade breakes yaboot.conf and > (maybe) ybin > > The proposed upload to t-p-u prepared by Milan Kupcevic is available > at [1]. He also tested the new package on a wide range of powerpc > subarchitectures. > > Along with this upload an upload of yaboot-installer to unstable is > planned. This new version will take advantage of the new yaboot > package and avoid errors with different device enumerate during d-i > and in the installed system (see #605932). The proposed patch is in > the BTS and also tested by Milan and several ppl on debian-powerpc. > > Do you approve these two uploads? Alternatively we could either upload > yaboot with an epoch to unstable or you would approve to update yaboot > to a new upstream version. > > Gaudenz > > [1] http://www.quarkline.net/debian/bug/yaboot/ -- Ever tried. Ever failed. No matter. Try again. Fail again. Fail better. ~ Samuel Beckett ~
Attachment:
signature.asc
Description: PGP signature