Re: [PATCH] dracut-initramfs-restore: make mount error nonfatal

2015-09-02 Thread Harald Hoyer
On 28.07.2015 13:55, Alexander Tsoy wrote:
> Script enables errexit option (set -e). So if /boot is not a mount point
> or is already mounted, then script dies after unsuccessful mount
> command. Fix this by always returning successful result.
> ---
>  dracut-initramfs-restore.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
> index 0e6a1a8..0c41a59 100644
> --- a/dracut-initramfs-restore.sh
> +++ b/dracut-initramfs-restore.sh
> @@ -14,7 +14,7 @@ SKIP="$dracutbasedir/skipcpio"
>  
>  [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
>  
> -mount -o ro /boot &>/dev/null
> +mount -o ro /boot &>/dev/null || true
>  
>  if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} 
> ]] ; then
>  IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
> 

Thanks! Merged
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] dracut-initramfs-restore: make mount error nonfatal

2015-07-28 Thread Dracut GitHub Import Bot
Patchset imported to github.
Pull request:
https://github.com/haraldh/dracut/compare/master...dracut-mailing-devs:E1ZK3hi-SN-Lt%40puleglot.ru


--
To unsubscribe from this list: send the line unsubscribe initramfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] dracut-initramfs-restore: make mount error nonfatal

2015-07-28 Thread Alexander Tsoy
Script enables errexit option (set -e). So if /boot is not a mount point
or is already mounted, then script dies after unsuccessful mount
command. Fix this by always returning successful result.
---
 dracut-initramfs-restore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 0e6a1a8..0c41a59 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -14,7 +14,7 @@ SKIP=$dracutbasedir/skipcpio
 
 [[ -f /etc/machine-id ]]  read MACHINE_ID  /etc/machine-id
 
-mount -o ro /boot /dev/null
+mount -o ro /boot /dev/null || true
 
 if [[ $MACHINE_ID ]]  [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] 
; then
 IMG=/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd
-- 
2.3.6

--
To unsubscribe from this list: send the line unsubscribe initramfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html