* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh
@ 2010-10-06 1:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2010-10-06 1:47 UTC (permalink / raw
To: gentoo-commits
vapier 10/10/06 01:47:29
Modified: 1.1.3-dm-crypt-start.sh
Log:
Do not warn about global options #329437 by Marcin Mirosław.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?r1=1.1&r2=1.2
Index: 1.1.3-dm-crypt-start.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.1.3-dm-crypt-start.sh 30 Sep 2010 01:35:24 -0000 1.1
+++ 1.1.3-dm-crypt-start.sh 6 Oct 2010 01:47:29 -0000 1.2
@@ -274,6 +274,11 @@
fi
;;
+ dmcrypt_max_timeout=*)
+ # ignore global options
+ continue
+ ;;
+
*)
ewarn "Skipping invalid line in /etc/conf.d/${SVCNAME}: ${targetline}"
;;
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh
@ 2011-01-08 0:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2011-01-08 0:53 UTC (permalink / raw
To: gentoo-commits
vapier 11/01/08 00:53:41
Modified: 1.1.3-dm-crypt-start.sh
Log:
Tweak status detection to work with newer cryptsetup output #350345 by Aaron Lewis.
Revision Changes Path
1.3 sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?r1=1.2&r2=1.3
Index: 1.1.3-dm-crypt-start.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 1.1.3-dm-crypt-start.sh 6 Oct 2010 01:47:29 -0000 1.2
+++ 1.1.3-dm-crypt-start.sh 8 Jan 2011 00:53:41 -0000 1.3
@@ -54,7 +54,11 @@
cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
- if /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
+ # Older versions reported:
+ # ${target} is active:
+ # Newer versions report:
+ # ${target} is active[ and is in use.]
+ if cryptsetup status ${target} | egrep -q ' is active' ; then
einfo "dm-crypt mapping ${target} is already configured"
return
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh
@ 2011-01-08 1:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2011-01-08 1:03 UTC (permalink / raw
To: gentoo-commits
vapier 11/01/08 01:03:23
Modified: 1.1.3-dm-crypt-start.sh
Log:
Push out updated addon to fix baselayout-1 support #350399 by Manuel Danisch.
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.4 sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?r1=1.3&r2=1.4
Index: 1.1.3-dm-crypt-start.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 1.1.3-dm-crypt-start.sh 8 Jan 2011 00:53:41 -0000 1.3
+++ 1.1.3-dm-crypt-start.sh 8 Jan 2011 01:03:23 -0000 1.4
@@ -1,7 +1,13 @@
# /lib/rcscripts/addons/dm-crypt-start.sh
-# For backwards compatability with baselayout < 1.13.0
-: ${SVCNAME:=${myservice}} #174256
+# For backwards compatability with baselayout < 1.13.0 #174256
+if [[ -z ${SVCNAME} ]] ; then
+ case ${myservice} in
+ ""|checkfs|localmount) SVCNAME=dmcrypt ;;
+ *) SVCNAME=${myservice} ;;
+ esac
+fi
+
dm_crypt_execute_checkfs() {
dm_crypt_execute_dmcrypt
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh
@ 2011-08-07 23:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2011-08-07 23:41 UTC (permalink / raw
To: gentoo-commits
vapier 11/08/07 23:41:05
Modified: 1.1.3-dm-crypt-start.sh
Log:
Patch by ekass to skip service-specific openrc configs #377927.
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Revision Changes Path
1.6 sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh?r1=1.5&r2=1.6
Index: 1.1.3-dm-crypt-start.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 1.1.3-dm-crypt-start.sh 12 Jan 2011 23:36:42 -0000 1.5
+++ 1.1.3-dm-crypt-start.sh 7 Aug 2011 23:41:05 -0000 1.6
@@ -266,6 +266,9 @@
# skip comments and blank lines
[[ ${targetline}\# == \#* ]] && continue
+ # skip service-specific openrc configs #377927
+ [[ ${targetline} == rc_* ]] && continue
+
# check for the start of a new target/swap
case ${targetline} in
target=*|swap=*)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-07 23:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-07 23:41 [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: 1.1.3-dm-crypt-start.sh Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-01-08 1:03 Mike Frysinger (vapier)
2011-01-08 0:53 Mike Frysinger (vapier)
2010-10-06 1:47 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox