diff options
| author | bubulle <bubulle@alioth.debian.org> | 2012-03-10 18:38:36 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2012-03-10 18:38:36 +0000 |
| commit | ee03a1e7aaf9a4141b872731aa4454abdfbb1a4b (patch) | |
| tree | 4e85e43d55229d5c079a4fb0dee2339a1ad0455a | |
| parent | 14066d41c19b49a7ff85d4c0e03d2428c3b3ea97 (diff) | |
| download | samba-ee03a1e7aaf9a4141b872731aa4454abdfbb1a4b.tar.gz | |
* Merge some Ubuntu patches:
- samba.config: Avoid scary pdbedit warnings on first import.
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@4034 fc4039ab-9d04-0410-8cac-899223bdd6b0
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/samba-common.postinst | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8625636ddd..641d7fe1f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ samba (2:3.6.3-2) UNRELEASED; urgency=low (thanks, backports!) * Lower priority of debconf question to medium after some pondering. After all, we have a sane default. Closes: #662801 + * Merge some Ubuntu patches: + - samba.config: Avoid scary pdbedit warnings on first import. [ Maarten Bezemer ] * Removed references to the testprns command from documentation diff --git a/debian/samba-common.postinst b/debian/samba-common.postinst index f3a5adbefd..4a9361de11 100644 --- a/debian/samba-common.postinst +++ b/debian/samba-common.postinst @@ -98,9 +98,15 @@ if [ -e "$CONFIG" ]; then fi ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG" -ucfr samba-common "$CONFIG" -chmod a+r "$CONFIG" +if [ ! -e "$CONFIG" ]; then + echo "Install/upgrade will fail. To recover, please try:" + echo " sudo cp /usr/share/samba/smb.conf $CONFIG" + echo " sudo dpkg --configure -a" +else + ucfr samba-common "$CONFIG" + chmod a+r "$CONFIG" +fi # ------------------------- Debconf questions end --------------------- |