[debian-lan-devel] [debian-lan] 01/01: First step towards nbd swap activation.

Andreas B. Mundt andi at moszumanska.debian.org
Tue Jan 24 06:16:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 3dea704f6160234d5775cce473b5b1f3b15d3e71
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Jan 24 06:40:41 2017 +0100

    First step towards nbd swap activation.
    
    Missing:
      - load module nbd
      - start services on boot ('systemctl enable nbd at nbd0')
      - configure nbdtab
      - check postrun
      - …
---
 fai/config/debconf/DISKLESS_CLIENT                       | 8 --------
 fai/config/files/usr/local/sbin/nbdswapd/DISKLESS_SERVER | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/fai/config/debconf/DISKLESS_CLIENT b/fai/config/debconf/DISKLESS_CLIENT
index d2a4f8e..d4faa29 100644
--- a/fai/config/debconf/DISKLESS_CLIENT
+++ b/fai/config/debconf/DISKLESS_CLIENT
@@ -6,11 +6,3 @@ xserver-xorg xserver-xorg/autodetect_monitor boolean false
 xserver-xorg xserver-xorg/autodetect_keyboard boolean true
 xserver-xorg xserver-xorg/autodetect_mouse boolean true
 xserver-xorg xserver-xorg/autodetect_video_card boolean true
-nbd-client nbd-client/killall boolean false
-nbd-client nbd-client/device string /dev/nbd0
-nbd-client nbd-client/host string swapserver
-nbd-client nbd-client/port string 10809
-nbd-client nbd-client/type select swap
-## FIXME: workaround #685610
-nbd-client nbd-client/extra string -Nswap
-nbd-client nbd-client/number string 1
diff --git a/fai/config/files/usr/local/sbin/nbdswapd/DISKLESS_SERVER b/fai/config/files/usr/local/sbin/nbdswapd/DISKLESS_SERVER
index ef22379..ca12300 100755
--- a/fai/config/files/usr/local/sbin/nbdswapd/DISKLESS_SERVER
+++ b/fai/config/files/usr/local/sbin/nbdswapd/DISKLESS_SERVER
@@ -14,4 +14,5 @@ test -d $SWAPDIR || mkdir -p $SWAPDIR
 
 ## create swap file:
 dd if=/dev/zero of=$SWAP bs=1M count=0 seek="$SIZE" 2> /dev/null
+mkswap $SWAP
 chmod 600 $SWAP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git



More information about the debian-lan-devel mailing list