Swith media to home

Switch to mageia 6

diff --git a/config/data.conf b/config/data.conf
index 228834fea4d18bdfea251614aa139e588ff60e48..6f0c7596990a5d25bb6905ede40bcc0cff89630e 100644 (file)
--- a/config/data.conf
+++ b/config/data.conf
@@ -1,5 +1,7 @@
 # Data luks name
 # Data luks name

-DATANAME='data'
+DATANAME='home'
+# Data luks path
+DATAPATH='/home'

 # Data uuid (uuidgen)
 DATAUUID=`uuidgen`
 # Luks data uuid (uuidgen)
 # Data uuid (uuidgen)
 DATAUUID=`uuidgen`
 # Luks data uuid (uuidgen)

diff --git a/config/flavour.conf b/config/flavour.conf
index 12400b0655f71e5bcc2936b691d22c43b9e948e3..a9b6d828c53157d9eec9bc49498b1409792b3ce4 100644 (file)
--- a/config/flavour.conf
+++ b/config/flavour.conf
@@ -1,4 +1,4 @@
 # Mageia arch (i586|x86_64)
 ARCH='x86_64'
 # Mageia release (1|2|3|4|5|6|cauldron)
 # Mageia arch (i586|x86_64)
 ARCH='x86_64'
 # Mageia release (1|2|3|4|5|6|cauldron)

-MGARELEASE='cauldron'
+MGARELEASE='6'

diff --git a/lib/pattern.sh b/lib/pattern.sh
index a0d0f6ab37aef02b92968be2bf19d9284a85903d..ed99a725d8a639148b0f91888ff9e3177fe506a7 100755 (executable)
--- a/lib/pattern.sh
+++ b/lib/pattern.sh
@@ -89,7 +89,7 @@ UUID=${BOOTUUID}      /boot   ext3    defaults,noatime 1 2
 UUID=${SLASHUUID}      /       btrfs   defaults,relatime 1 1
 UUID=${SWAPAUUID}      none    swap    sw 0 0
 UUID=${SWAPBUUID}      none    swap    sw 0 0
 UUID=${SLASHUUID}      /       btrfs   defaults,relatime 1 1
 UUID=${SWAPAUUID}      none    swap    sw 0 0
 UUID=${SWAPBUUID}      none    swap    sw 0 0

-UUID=${DATAUUID}       /media  btrfs   defaults,relatime,nofail 1 2
+UUID=${DATAUUID}       ${DATAPATH}     btrfs   defaults,relatime,nofail 1 2

 proc                                           /proc   proc    defaults 0 0
 EOF
 
 proc                                           /proc   proc    defaults 0 0
 EOF