From patchwork Thu Feb 20 19:04:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2800 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48NkYB4WSrz3whT for ; Thu, 20 Feb 2020 19:04:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48NkY90R7PzBD; Thu, 20 Feb 2020 19:04:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48NkY85MXsz2y2X; Thu, 20 Feb 2020 19:04:44 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48NkY62NYQz2xn1 for ; Thu, 20 Feb 2020 19:04:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48NkY53gdlzBD; Thu, 20 Feb 2020 19:04:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1582225481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=L6O9/KWfdYK4HDLa2aQl9d/QOWPwr+pd8iRceStQoUM=; b=p1Ke7Dk3DN6plh+Srv5mPCHG+zpHU30A+ggLPWeQ3ljjt8MLsGEZin/fRqpsrOlXCssP3N u3zh4QkNvDb9LABg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1582225481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=L6O9/KWfdYK4HDLa2aQl9d/QOWPwr+pd8iRceStQoUM=; b=Wx5/LkHHvU4m1nCVq9Vql1hUcneWrLWmcVC1AgySR9HUux6UUwLOazSxc2FDg9by1yqyd1 4HZ/u2Z2nvjqD9p83q4IqfEuvPtmr6pzgMRbbmgE311Qrfd82HS1aDlfD6vUbSfnKrip+i 78gjEOL8T6W14I7wO5JY0/DgKmALRE+jHqS9yc338R4KlZXKpHbg99EG4drosL6WDRgfFZ 13GJFbiEN3gDneLBwFpxVCZd0nw70IAInrF+VBzUrrf+9knXA1Dg64813jImdIStMXQmaw 3tELN8gxUktognRbUGzyGXs5Kp6iQ7CU7+SsIVc5GwujrlA5Rsgf2JQBiUIT7A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] swap: Start swap after mounting filesystems Date: Thu, 20 Feb 2020 19:04:30 +0000 Message-Id: <20200220190430.30134-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" When using a swap file, it is not being activated correctly when the filesystem it is residing on is not mounted, yet. The root file system is mounted read-only here before S40mountfs is being executed. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- lfs/initscripts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 34ea1433f..9d54101ae 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -184,10 +184,10 @@ etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives -etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs +etc/rc.d/rcsysinit.d/S41swap etc/rc.d/rcsysinit.d/S42fsresize etc/rc.d/rcsysinit.d/S43mounttmpfs etc/rc.d/rcsysinit.d/S44smt diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 34ea1433f..9d54101ae 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -184,10 +184,10 @@ etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives -etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs +etc/rc.d/rcsysinit.d/S41swap etc/rc.d/rcsysinit.d/S42fsresize etc/rc.d/rcsysinit.d/S43mounttmpfs etc/rc.d/rcsysinit.d/S44smt diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 9350b0e90..120d821a0 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives -etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs +etc/rc.d/rcsysinit.d/S41swap etc/rc.d/rcsysinit.d/S42fsresize etc/rc.d/rcsysinit.d/S43mounttmpfs etc/rc.d/rcsysinit.d/S44smt diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 9350b0e90..120d821a0 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives -etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs +etc/rc.d/rcsysinit.d/S41swap etc/rc.d/rcsysinit.d/S42fsresize etc/rc.d/rcsysinit.d/S43mounttmpfs etc/rc.d/rcsysinit.d/S44smt diff --git a/lfs/initscripts b/lfs/initscripts index 3a769bd99..45059e9d5 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -164,10 +164,10 @@ $(TARGET) : ln -sf ../init.d/lvmetad /etc/rc.d/rcsysinit.d/S09lvmetad ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives - ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S20swap ln -sf ../init.d/partresize /etc/rc.d/rcsysinit.d/S25partresize ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs + ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S41swap ln -sf ../init.d/fsresize /etc/rc.d/rcsysinit.d/S42fsresize ln -sf ../init.d/mounttmpfs /etc/rc.d/rcsysinit.d/S43mounttmpfs ln -sf ../init.d/smt /etc/rc.d/rcsysinit.d/S44smt