From c75e0cc7f5807789ada67c9ff366770f6ad5ba40 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Thu, 1 Aug 2013 12:34:53 -0700 Subject: [PATCH] Removing the remaining bits of swap support PC is not supporting swap partitions at the moment, so remove the logic to create the unit files, etc. Change-Id: I453ea8fa2207f5efc159c83c6855933e66104865 --- scripts/system-installer | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/system-installer b/scripts/system-installer index e0bc28d..5c97999 100644 --- a/scripts/system-installer +++ b/scripts/system-installer @@ -215,19 +215,6 @@ function install_os { chmod 0755 ${TGTMNT}/dev rm ${TGTMNT}/etc/fstab - SYSTEMD_ESCAPED_DEV=$(echo ${TARGET_DEV} | sed 's|^/||' | sed 's|/|-|g') - mkdir -p ${TGTMNT}/usr/lib/systemd/system/swap.target.wants - cat > ${TGTMNT}/usr/lib/systemd/system/${SYSTEMD_ESCAPED_DEV}1.swap << EOF -[Unit] -Description=Swap Filesystem -Documentation=man:systemd.swap(5) -Documentation=http://www.freedesktop.org/wiki/Software/systemd/systemd.swap.html - -[Swap] -What=${TARGET_DEV}1 -EOF - - ln -s ../${SYSTEMD_ESCAPED_DEV}1.swap ${TGTMNT}/usr/lib/systemd/system/swap.target.wants/${SYSTEMD_ESCAPED_DEV}1.swap if [[ $FILESYSTEM = "btrfs" ]]; then ROOTFLAGS="rootflags=subvol=tizen" @@ -257,7 +244,7 @@ menu clear label tizen menu label Boot Tizen kernel ../vmlinuz - append root=${ROOTFS} rw vga=current splash=silent quiet ${ROOTFLAGS} resume=${TARGET_DEV}1 + append root=${ROOTFS} rw vga=current splash=silent quiet ${ROOTFLAGS} menu default EOF -- 2.7.4