Skip to content

Commit 6d2d640

Browse files
committed
RPi: Move toward generated MotD
Fixes arch_rpi_image_prepare#14
1 parent d6a2088 commit 6d2d640

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ tmp/*
99
piratebox/piratebox/bin/miniircd.py
1010
piratebox/piratebox/www/Shared
1111
piratebox/piratebox/www/cgi-bin/data.pso
12+
piratebox/piratebox/rpi/motd.txt

Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
77
PACKAGE_NAME=$(NAME)_$(VERSION)
88
PACKAGE=$(PACKAGE_NAME).tar.gz
99
VERSION_FILE=$(PB_FOLDER)/$(PB_FOLDER)/version
10+
MOTD=$(PB_FOLDER)/$(PB_FOLDER)/rpi/motd.txt
1011

1112
IMAGE_FILE=piratebox_ws_1.1_img.gz
1213
TGZ_IMAGE_FILE=piratebox_ws_1.1_img.tar.gz
@@ -32,16 +33,18 @@ $(IRC_TARGET_SERVER):
3233
git clone $(IRC_GITHUB_ULR) $(IRC_WORK_FOLDER)
3334
cp $(IRC_SRC_SERVER) $(IRC_TARGET_SERVER)
3435

35-
$(VERSION):
36+
$(MOTD):
37+
sed -e 's|##version##|$(VERSION)|' rpi.motd-template.txt > $@
38+
39+
$(VERSION):
3640
echo "$(PACKAGE_NAME)" > $(VERSION_FILE)
3741
echo `git status -sb --porcelain` >> $(VERSION_FILE)
3842
echo ` git log -1 --oneline` >> $(VERSION_FILE)
3943

40-
$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION)
41-
tar czf $@ $(PB_FOLDER)
42-
44+
$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION) $(MOTD)
45+
tar czf $@ $(PB_FOLDER)
4346

44-
$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER)
47+
$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER) $(MOTD)
4548
mkdir -p $(MOUNT_POINT)
4649
echo "#### Mounting image-file"
4750
sudo mount -o loop,rw,sync $(SRC_IMAGE_UNPACKED) $(MOUNT_POINT)
@@ -93,7 +96,7 @@ clean: cleanimage
9396
rm -fr $(IRC_WORK_FOLDER)
9497
rm -f $(IRC_TARGET_SERVER)
9598
rm -f $(PACKAGE)
96-
rm -f $(VERSION_FILE)
99+
rm -f $(VERSION_FILE) $(MOTD)
97100

98101
cleanimage:
99102
- rm -f $(TGZ_IMAGE_FILE)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ____________________.__ __ __________
55
|____|_ /|____| |__||__| (____ /__| \___ >______ /\____/__/\_ \
66
\/ \/ \/ \/ \/
77

8-
Website: http://piratebox.cc PirateBox Version: 1.1.3
9-
Forum: http://forum.piratebox.cc RPi Image Version: 1.1.3-1
8+
Website: http://piratebox.cc PirateBox Version: ##version##
9+
Forum: http://forum.piratebox.cc Build date: 00-00-0000
1010
IRC: #piratebox irc.freenode.net Be open -- Share freely!
1111

1212
First Steps After Flashing

0 commit comments

Comments
 (0)