From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 17 May 2016 12:52:57 +0200 Subject: update submodules so "rake test" doesnt complain anymore --- puppet/modules/backupninja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/backupninja/templates/umount.handler') diff --git a/puppet/modules/backupninja b/puppet/modules/backupninja index 49751354..5268a87c 160000 --- a/puppet/modules/backupninja +++ b/puppet/modules/backupninja @@ -1 +1 @@ -Subproject commit 497513547be79f9d3c8e96f1650ec43ee634b277 +Subproject commit 5268a87c329f895017f8ea6c6abc377a4f9a6a77 -- cgit v1.2.3 From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/backupninja | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/backupninja (limited to 'puppet/modules/backupninja/templates/umount.handler') diff --git a/puppet/modules/backupninja b/puppet/modules/backupninja deleted file mode 160000 index 5268a87c..00000000 --- a/puppet/modules/backupninja +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5268a87c329f895017f8ea6c6abc377a4f9a6a77 -- cgit v1.2.3 From 6a895ece94a86c9ccc32c9bec51413d4e4f0df8e Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:46:29 -0400 Subject: git subrepo clone https://leap.se/git/puppet_backupninja puppet/modules/backupninja subrepo: subdir: "puppet/modules/backupninja" merged: "5268a87" upstream: origin: "https://leap.se/git/puppet_backupninja" branch: "master" commit: "5268a87" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: I147608fbb12a35fe83642d4d031009dcc62cecee --- puppet/modules/backupninja/templates/umount.handler | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 puppet/modules/backupninja/templates/umount.handler (limited to 'puppet/modules/backupninja/templates/umount.handler') diff --git a/puppet/modules/backupninja/templates/umount.handler b/puppet/modules/backupninja/templates/umount.handler new file mode 100644 index 00000000..4fea195a --- /dev/null +++ b/puppet/modules/backupninja/templates/umount.handler @@ -0,0 +1,15 @@ +#!/bin/sh + +# Unmount the specified directory ('dir'), forcefully if necessary. + +getconf dir + +if ! umount $dir; then + warning "Simple unmount failed for $dir; being forceful" + if ! umount -f $dir; then + warning "Forceful unmount failed for $dir; being lazy" + if ! umount -l $dir; then + warning "Lazy unmount failed for $dir; you're on your own" + fi + fi +fi -- cgit v1.2.3