Hello community,
here is the log from the commit of package cryptsetup-mkinitrd for
openSUSE:Factory checked in at 2013-08-01 06:54:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cryptsetup-mkinitrd (Old)
and /work/SRC/openSUSE:Factory/.cryptsetup-mkinitrd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cryptsetup-mkinitrd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cryptsetup-mkinitrd/cryptsetup-mkinitrd.changes
2013-07-05 14:55:13.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.cryptsetup-mkinitrd.new/cryptsetup-mkinitrd.changes
2013-08-01 06:54:31.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 31 15:24:52 UTC 2013 - [email protected]
+
+- Remove usage of absolute paths in mkinitrd scripts
+
+-------------------------------------------------------------------
Old:
----
boot_crypto-0_201307050943.tar.xz
New:
----
boot_crypto-0_201307311719.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cryptsetup-mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.XUXIOj/_old 2013-08-01 06:54:32.000000000 +0200
+++ /var/tmp/diff_new_pack.XUXIOj/_new 2013-08-01 06:54:32.000000000 +0200
@@ -18,7 +18,7 @@
Name: cryptsetup-mkinitrd
Url: http://gitorious.org/opensuse/boot_crypto
-Version: 0_201307050943
+Version: 0_201307311719
Release: 0
Summary: mkinitrd plugin scripts for encrypted root file system
License: GPL-2.0+
++++++ boot_crypto-0_201307050943.tar.xz -> boot_crypto-0_201307311719.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/boot_crypto-0_201307050943/mkinitrd/boot-luks.sh
new/boot_crypto-0_201307311719/mkinitrd/boot-luks.sh
--- old/boot_crypto-0_201307050943/mkinitrd/boot-luks.sh 2013-07-05
09:43:49.000000000 +0200
+++ new/boot_crypto-0_201307311719/mkinitrd/boot-luks.sh 2013-07-31
17:19:36.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
#%stage: crypto
-#%programs: /usr/sbin/cryptsetup $cryptprograms /sbin/vgscan /sbin/vgchange
+#%programs: cryptsetup $cryptprograms vgscan vgchange
#%udevmodules: dm-crypt $cryptmodules
#%if: "$root_luks" -o "$luks"
#
@@ -25,7 +25,7 @@
luks_check_ply()
{
- if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping; then
+ if [ -x "$(type -p plymouth)" ] && plymouth --ping; then
return 0
fi
return 1
@@ -75,15 +75,15 @@
eval local dev="\"\${luks_${name}}\""
eval local realname="\"\${luks_${name}_name}\""
if [ "$ask_pass" = no ]; then
- /usr/sbin/cryptsetup --tries=1 luksOpen "$dev" "$realname"
+ cryptsetup --tries=1 luksOpen "$dev" "$realname"
ret="$?"
elif luks_check_ply; then
- /usr/bin/plymouth ask-for-password --prompt="Unlocking
${realname} ($dev)" | /usr/sbin/cryptsetup --tries=1 luksOpen "$dev" "$realname"
+ plymouth ask-for-password --prompt="Unlocking ${realname}
($dev)" | cryptsetup --tries=1 luksOpen "$dev" "$realname"
ret="$?"
else
echo -e "${extd}Unlocking ${realname} ($dev)${norm}"
splash_off
- /usr/sbin/cryptsetup --tries=1 luksOpen "$dev" "$realname"
+ cryptsetup --tries=1 luksOpen "$dev" "$realname"
ret="$?"
fi
return "$ret"
@@ -128,7 +128,7 @@
if [ -n "$reuse_pass" ]; then
if [ -z "$pass" ]; then
if luks_check_ply; then
- pass=`/usr/bin/plymouth
ask-for-password --prompt="Enter LUKS Passphrase"`
+ pass=`plymouth
ask-for-password --prompt="Enter LUKS Passphrase"`
else splash_off
echo
echo -e "${extd}Need to
unlock encrypted volumes${norm}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/boot_crypto-0_201307050943/mkinitrd/setup-luks.sh
new/boot_crypto-0_201307311719/mkinitrd/setup-luks.sh
--- old/boot_crypto-0_201307050943/mkinitrd/setup-luks.sh 2013-07-05
09:43:49.000000000 +0200
+++ new/boot_crypto-0_201307311719/mkinitrd/setup-luks.sh 2013-07-31
17:19:36.000000000 +0200
@@ -95,7 +95,7 @@
for luksbd in $deps; do # should be only one for luks
update_blockdev $luksbd
dbg -n "isLuks $luksbd ... "
- if ! /usr/sbin/cryptsetup isLuks $luksbd 2>/dev/null; then
+ if ! cryptsetup isLuks $luksbd 2>/dev/null; then
dbg "no"
continue
fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
