On 08/13/2015 08:29 PM, Sunil Mohan Adapa wrote: [...] > Removing the executable is good thing. > > However, we can go one step further to this and cleanup the README file. > I suggest the following: > > Add files to /etc/update-motd.d/ to customize the login greeter message. > We can add a line there mentioning that FreedomBox user manual is > available in /usr/share/doc/freedombox-setup/. >
The attached patch proposes to do the above. It also unleashes the author's awe(some|full) art skills on the world with a FreedomBox logo (feel free ignore that part of the patch :) in motd. I have done the following tests on the full build image: - Login should show FreedomBox motd followed by regular motd - Should work in ssh login also - Should have all type of manuals in /usr/share/doc/freedombox-setup -- Sunil
From bd8830ee3cdde7890c1a28d778fee8792a938f4e Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <su...@medhas.org>
Date: Fri, 28 Aug 2015 17:36:27 +0530
Subject: [PATCH 1/2] Add motd and remove documentation in home dir
- Remove procedure to copy documentation to 'fbx' user's home directory.
- Indicate manual path in motd.
- FreedomBox logo in motd.
- Preserve existing motd.
- Cleanly remove when freedombox-setup package is removed.
---
data/etc/update-motd.d/50-freedombox | 17 +++++++++++++++++
debian/freedombox-setup.docs | 5 ++++-
debian/freedombox-setup.postinst | 12 ++++++++++++
doc/Makefile | 3 ---
setup.d/45_user-doc | 12 ------------
5 files changed, 33 insertions(+), 16 deletions(-)
create mode 100755 data/etc/update-motd.d/50-freedombox
delete mode 100755 setup.d/45_user-doc
diff --git a/data/etc/update-motd.d/50-freedombox b/data/etc/update-motd.d/50-freedombox
new file mode 100755
index 0000000..91a7012
--- /dev/null
+++ b/data/etc/update-motd.d/50-freedombox
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cat <<"EOF"
+
+ .--._ _.--.
+ ( \ / )
+ \ /\ /
+ \_ \/ _/
+ / \
+ ( /\ )
+ `--' `--'
+
+ FreedomBox
+
+FreedomBox is a pure blend of Debian GNU/Linux. FreedomBox manual is
+available in /usr/share/doc/freedombox-setup.
+EOF
diff --git a/debian/freedombox-setup.docs b/debian/freedombox-setup.docs
index d356aa9..d317f35 100644
--- a/debian/freedombox-setup.docs
+++ b/debian/freedombox-setup.docs
@@ -1 +1,4 @@
-doc/README.fbx-home
+doc/manual-jessie.txt
+doc/manual-jessie.pdf
+doc/manual-jessie.html
+doc/manual-jessie.epub
diff --git a/debian/freedombox-setup.postinst b/debian/freedombox-setup.postinst
index 9afcf41..c729555 100644
--- a/debian/freedombox-setup.postinst
+++ b/debian/freedombox-setup.postinst
@@ -19,4 +19,16 @@ if dpkg --compare-versions "$2" le "0.0.23" &&
rmdir /var/freedombox
fi
+# Setup motd
+if [ "$1" = "configure" ] && [ -f /etc/motd ] && [ ! -L /etc/motd ] ; then
+ mkdir -p /etc/update-motd.d
+ echo '#!/bin/sh' > /etc/update-motd.d/80-motd
+ echo 'cat <<"EOF"' >> /etc/update-motd.d/80-motd
+ cat /etc/motd >> /etc/update-motd.d/80-motd
+ echo 'EOF' >> /etc/update-motd.d/80-motd
+ chmod +x /etc/update-motd.d/80-motd
+ rm /etc/motd
+ ln -s ../var/run/motd /etc/motd
+fi
+
#DEBHELPER#
diff --git a/doc/Makefile b/doc/Makefile
index 62a0d4a..538f79c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,7 +19,6 @@ manual-jessie.html: manual-jessie.xml
manual-jessie.txt: manual-jessie.xml
LC_ALL=C xmlto txt $^
- cp $@ README.fbx-home
manual-jessie.epub: manual-jessie.xml
LC_ALL=C xmlto epub $^
@@ -42,5 +41,3 @@ lint: manual-jessie.xml
clean:
$(RM) manual-jessie.txt manual-jessie.pdf manual-jessie.html manual-jessie.epub manual-jessie.proc
-distclean: clean
- $(RM) README.fbx-home
diff --git a/setup.d/45_user-doc b/setup.d/45_user-doc
deleted file mode 100755
index 4e28bcd..0000000
--- a/setup.d/45_user-doc
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Put documentation in the fbx users home directory, if it exist
-if [ -d /home/fbx ] ; then
- zcat /usr/share/doc/freedombox-setup/README.fbx-home.gz > /home/fbx/README
- chmod a+rx /home/fbx/README
- chown fbx /home/fbx/README
-else
- echo info: Not adding /home/fbx/README.
-fi
--
2.5.0
From 4fcb993cafaf427f8f40a03e47407b14a25e1075 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <su...@medhas.org>
Date: Sat, 29 Aug 2015 16:59:44 +0530
Subject: [PATCH 2/2] Add motd file to list of files to install
---
debian/freedombox-setup.install | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/freedombox-setup.install b/debian/freedombox-setup.install
index 8bfed71..5f3b9a7 100644
--- a/debian/freedombox-setup.install
+++ b/debian/freedombox-setup.install
@@ -9,3 +9,4 @@ sbin/interface-detect usr/sbin
sbin/tor-get-orport usr/sbin
lxc-templates/lxc-debian-freedombox usr/share/lxc/templates
avahi-services etc/avahi/services
+data/etc/update-motd.d/50-freedombox etc/update-motd.d/
--
2.5.0
signature.asc
Description: OpenPGP digital signature
